labofsahil/github-event-dataset-2012 huggingface dataset:
So the merge hell ate the changes.

  - These are the real changes that I want to commit.
Changelog.
Add a proxy method for carrierwave images
Cantor for SimpleGrid
Lightsensor and GhostProtocolHandler: Position Hack
Cleanup angie. Full mapping supported.
Compiling errors, en WrappedLightSensor is deleted.
Barcode and line corruption mod.
Mapprotocol verbeterd. Dubbele code van reverse verwijderd.
NavigatorDriving debugging, Pacman debugging.
Worst-case bug in GhostMerge gehaald.
Indien een tweede barcode gevonden wordt, dan werd deze met de getransformeerde coordinaten gemerged...

GridPart en SimpleGrid zijn een beetje onhandig in design...
Implemented AggregatedGrid.java
TODO: implement the transformations in AggregatedSubGrid.java
Partially implemented AggregatedSubGrid.java, untested
Fixed test compilation errors after SimulationRunner cleanup
Fixed GhostRobotTest.java after SimulationRunner cleanup
Re-added the correct map2.track
Small change to AggregatedSubGrid.java, might cause problems
renamed SimulationRobotAgent -> SimulatedGatewayClient
implemented logging using log4j
added GridView for each simulated robot
fixed name in documentation, should be changed to BluetoothGatewayClient
removed GoalDecider
fixed MiniSimulator
patched ColorLink to return default GRAY
Work on AggregatedGridTest.java
Cleanup of all Grid+transformation logic
Merging seems to be working.
Fixed using Sector.put instead of Actor.assignSector
Fixed duplicate Agents after grid copy
with core workers
Created fetch function and api call
Api call actually returns fetched notes
Update the fallback implementation to the new code structure.
Move GetPreviewStreamImpl() back to where it used to be to make the diff cleaner.
Started polishing non-2^k part of section 5. Reversed order of sections of section 5. 2^k portion is now presented first
Add support for building helpers
remove default debug setting
Add EWK selection helper and correspoding info in Chicago eventbuilder
Uncommented trailing bracket.
09-4
Update prevent duplication
Changed scaling of x,y coord in drawScaledPlane.
Enable forgotten query filter by supported keywords
remove debug flush logging
Add index.html test
Change of reference images for students' view in the slides
기본 폴더명 변경
JPA 적용
레이아웃 파일명 변경
누락된 JPA 설정 추가
twitter bootstrap 적용
초기화 데이터 코드 추가
Added zooshow.pl to let know who is current leader in the zookeeper ensemble
revised HTML to v1.8
mv src/joj-url.html src/joj.url.html; change final output to joj.url
Makefile: chmod 744 joj.url; deploy (rsync) joj.url
src/VERSION.txt: bump to version X.5
query and list improve
added option add-monitors
Relax version dependency on multi_json
Decrease complexity of ResultFetcher implementation
blog naming
bill counted?
bug 760389 - automatically clobber all releases. r=rail
Bug 739385 - remove geriatric master configs - r=aki
Bug 751895 - Preproduction release master fails trying to checkconfig. r=jhopkins
bug 710312: do release jobs on all build masters instead of one. r=catlee
Import name.
archsysinfo -> archsysinfo-tiny
Update documentation.
Add cluster pool based on IPython.parallel package.
Add broker methods to glimpse-cluster-wrapper.
Add export script for Orange file format.
Allow Svm objects to wrap an existing LIBSVM classifier.
Fix bug in glab when setting output layer.
Fix package paths in setup script.
Add optional profile argument to ipython_cluster main script.
Merge branch 'sandbox-thomure' of github.com:mthomure/glimpse-project into sandbox-thomure
Refactor glimpse-cluster driver script.
Add map_with_shared_data to IPython cluster pool, to reduce network traffic for large models.
Make the cluster pool type a parameter, to allow easy switching between cluster implementations.
Fix glab bug when printing object if SVM has not been run.
Add error handling on glab Experiment load, and change features and images properties to functions.
Add workaround for missing imap function in gearman cluster pool.
Fix handling of errors in gearman cluster pool.
Fix exception handling in glab when image source is unknown.
Add option to explicitly specify corpus subdirectories in glab.
Add glab option to resize minimum dimension of corpus images.
Add message attribute to InputSourceLoadException.
updates code comments to reflect reality
corrects NumberFormatter.format() to take a DataValue argument, rather than a plain number
sshd_log: CRLF to LF (bad interp. error)
Merge pull request #188 from dotdoom/master-sshd_log_crlf_to_lf

sshd_log: CRLF to LF (bad interp. error)
added state_object_accessors state_object_mutators where
Site updated at 2012-03-30 22:55:04 UTC
rank.php : side et badges s'affichent que si on est loggé
Ajout de message d'info si aucun nom & prenom ont été entré
supression de l'avatar
BUG:TimeOut Zombi
Improve README

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>
MultiRouter
MultiRouter example
Slight tweaks to help loading & error messages fit better, on phones with browser chrome, etc.
Added error handling for PCR primers
Ligation function implemented, but not extensively tested yet.
prettyPrint function
added ligation and digestion printouts
Added prettyprint for all DNAs
Site updated at 2012-09-18 07:48:36 UTC
I hate stupid syntax errors.
first version of server
server in production
Expanded README content
Really adding examples.
changed line endings & plugin fixed - ALL x values must be returned to Date()
slightly better test granularity
file system tests
Document most of the new evbuffer functionality
CKEditor configurations
Merge branch 'master' of github.com:nnotario/nivariaglltheme
Update snippets para Codeigniter
Slightly Better on the cropping...but there is the occasional exception thrown when resizing the image :/
create file for redirecting
initial commit of sample app
cleanup

remove some logging
set a header for the list view that shows the request type for now
set the searchbar keyboard appearance (to make it black)
xcode analyze fixes
changes to peters folder
Only importing dirname from os now as the rest isn't needed
remove input sourcing now that vars are exported to child shells
Fixes #3337: Misc Fortran cleanups in v1.6

Custom patch from ticket:

 * Add pop_commutative_f.c to ompi/mpi/f77/profile/Makefile.am
 * Fix MPI_SIZEOF for CHARACTER and LOGICAL types
Fixes #3045: Improve the collective selection algorithm

---svn-pre-commit-ignore-below---

r26080 [[BR]]
Help he selection of the right algorithm for large data (> 2Gb). Thanks
to Fujitsu for the patch.

r26084 [[BR]]
Allow the user to define dynamic rules for messages larger than 2GB.
Fixes #3303: Move memchecker configure fix to v1.6

---svn-pre-commit-ignore-below---

r27267 [[BR]]
Abort configure if --enable-memchecker was specified, but then no
memchecker components were able to configure successfully.
Fixes #3307: get rid of a tcp warning on Windows

---svn-pre-commit-ignore-below---

r27291 [[BR]]
Windows doesn't need to exclude any interface by default. This will avoid tcp warnings.
Fixes #3318: Move FreeBSD detection improvement to v1.6

---svn-pre-commit-ignore-below---

r27334 [[BR]]
FreeBSD detection improvement.  Thanks to Brooks Davis for the patch.
Fixes #3327: Move TSD change in memory/linux to 1.6

---svn-pre-commit-ignore-below---

r27371 [[BR]]
Remove the TSD_HACKS macro.  The TSD hack is only for non-glibc libraries
and we only build the linux memory component on glibc, so this shouldn't
be needed.
Fixes #3341: Fix rankfile when no -np is given

Custom patch from ticket: Basically, we were looking at the rankfile
results to determine if a proc had already been created, instead of
looking at the actual proc array.
Fixes #3343: Please add ConnectIB device ID into v1.6 tree

---svn-pre-commit-ignore-below---

r27402 [[BR]]
openib: added Mellanox ConnectIB device ID and params to the device parameters ini file
README.MD CHANGED AND readme.txt DELETED
отдельный шаблон печати расписания для НФ ТЭЮИ
если один учебный корпус сразу делаем ссылку на просмотр загрузки аудиторного фонда
Bug-19484: First try using XMLReader
Merge branch 'master' into Bug-19484
Bug 19484: Remove old Info class
Bug 19484: New XML Parser and first Info class
Bug 19484: Add Parser Exception
Bug 19484: Respect qualifier and add Exception usage.
Bug 19484: Fix var name.
Bug 19484: Fix throwing exceptions and react on empty elements.
Bug 19484: Convert Status parser
Bug 19484: Convert Log Parser
Bug 19484: Convert List Parser
Bug 19484: Fix documentation
Bug 19484: Remove package dependency
Bug 19636 - Instantiate System before calling which function as function isn't static
fixed dependencies problem. Scope of mockito was not test.
fixed dependencies problem. Scope of slf4j-simple was not test.
-updated new config files.
-partially implemented new configuration.
-moving to using getFunc function.
-new configuration module.
コメントアウト外し忘れ…。
**RECOVERY v 1.0.3** blue_screen.png delete
Signed-off-by: Nicolas Alejandro Spadavecchia <ingspadavecchia@gmail.com>
Merge branch 'master' of https://github.com/pablorodriguez/qponmovil

Conflicts:
	app/controllers/coupons_controller.rb

Signed-off-by: Nicolas Alejandro Spadavecchia <ingspadavecchia@gmail.com>
Update application/_posts/2010-07-29-data-visualization.md
added youtube link to demo video to readme
changed update location to pani-c
Adding a more recent version of ical4j-connector
Removing ExchangeImpersonation requirement for CreateFolder operation
Fixing bug in ineligible queue (wasn't including withdrawn participants with completed interviews)
Merge remote branch 'origin/release' into qa
Merge remote branch 'origin/qa' into develop
Fixed some shader compile problems
Fix countAssets recursion.

Also more compact.
Simplify some things in CheatsMenuHandler.java
rsp-hle: Manually apply git's core.autocrlf=true setting
rsp-hle: Import from hg:mupen64plus-rsp-hle 85:1e306f08d231
bugfix: Input map preference wasn't persisting on dialog close.

Bug introduced in commit 5cddbac24e7296460902a5a11fde6e5b617cb19b
draw all known lines
Release version change: 5.0.0-2012Sep17
Next release version: 5.0.0-SNAPSHOT
started stories page - the one with videos and inspirational stuff
Merge branch 'master' of github.com:peetahzee/24hrs-tamuseum
stories!
Merge branch 'master' of github.com:peetahzee/24hrs-tamuseum
stories reform - images in
Merge branch 'master' of github.com:peetahzee/24hrs-tamuseum
merged stylesheet donate with stories
Custom tag for Pleiades place type (incomplete)
suppress wrong project
list/add users
Configuration loading improvements.

Moved service configuration inside theMeticSystem section and added
IgnoreSection handler to app.config.
Updated Program.cs to use log4net.debug.config for console builds.
Added sample IAM security policy to README.md.
fixed store locator to use .json
renamed
going to need to deal with merge conflict maybe
fixed conflict in syllables.py
We generate some random haiku. Jeans.
tableView with custom cell UITablevViewCell
Add some cmdalacon
added to license
Fixed issue #16: control mesh for triangular bezier fixed
Merge pull request #21 from pixelperfect3/dev

Fixed issue #16: control mesh for triangular bezier fixed
Added prescription view/methods, drug listview now working, stop medication methods and php scripts updated
Fix ManagePortletsViewlet to work with Plone 4+.
Give an example of recording custom activities
detect changes in planet feed
lilith -> acrylamid
use VimML highlighting in pentadactyl post
relative and absolute urls
update
conf.py for 0.5.0
expirimental bi-line
dep tweek
Renamed PluginList.defaults to just default.
Added FFI::Extractor.plugins.
Added a class for the MetadataProcessor callback.
Extract the plugin name from the plugin path.
mimetype and filename are two words.
Added Extractor.abort!, extract and extract_from.
Fix measurement units for fixed payments in tariff eval logic - part 2.
trying to setup a proper file structure
Fixing bug in queryFirst with an element
U421 PIR monitoring (or at least the better part of it)
Pushed messages to stderr allowing for piping
Commit after night 2
Add code to create a spatially uniform but temporally varying wind field
Fixed some bugs in article paging
rabbit_misc:memory/0.
Try to keep our categories disjoint.
Consistency
Move to rabbit.erl, and only invoke erlang:memory/1 once so we do a better job of showing results from a single point in time.
As far as the user is concerned, atoms and code are really the same thing for memory use.
Simplify
Reinstate atoms
Account for the mgmt DB as another category, since it can get quite big.
Rename this, since it can include memory which does not still belong to a process (e.g. after GC).
Go to an entirely supervisor-based way of counting process memory. This has the disadvantage that we need to combine channel and connection memory, but we are far more inclusive, accounting for limiters, writers, supervisors etc. In particular this helps a lot when we have thousands of queues since the queue_sup ends up taking a lot of memory in its own right. This seems to bloat rabbit_mgmt_external_stats less (although still some) in the 100k queue case too. Also measure memory use of mgmt_db and msg_store processes and add them appropriately.
Move this stuff to its own module
Ignore dead processes.
Add in memory used by SSL and outgoing connections to the connection / channel total.
Plugins
Never display negative memory.
You would think I would at least compile it.
Work on older Erlangs.
interval_operation/3
Lintian warnings
active_consumers info item.
appease CI gods
move table handling code from rabbit_mnesia to rabbit_table
merge default into bug25179
Mark enqueued-on-promotion messages as redelivered
Let's try that again: we no longer need to use confirmed_broadcast here due to lack of immediate.
API change
Stick redelivered in #message_properties, which makes the diff rather smaller.
I put that on the wrong branch. And it's obsolete now anyway.
s/redelivered/delivered/g
Don't change the signature of init_with_backing_queue_state
cosmetic
undo spurious change
merge bug25185 into default
merge bug25145 into default
Merge bug25179
stylistic consistency
cosmetic: remove comment that no longer applies
This should have been done when consumer cancellation notifications
were introduced.
remove superfluous comment
We already say that stuff from MA gets requeued. Furthermore, the
master doesn't have an 'MA' field as such - the information is kept in
the backing queue.
cosmetic(ish)
cosmetic
Merge default
Make plugin compatible to Dancer 2.
Add note about Dancer 1 and 2 compatibility to main POD.
Bump up version number.
Prepare Changes and README files for upcoming release.
Set prerequisite on Dancer to the version introducing the plugin_args keyword.
Agrega funciones al modelo de Usuario con acceso a persistencia version 1 no funcional
Bug Fixes + New Classes

1. Updated code for bug fixes.
2. Designed classes AcquisitionInfo, CompetitorInfo, FundingRoundsInfo,
ProductInfo, ScreenshotsInfo
Typo fixed for earlier commit
Prepare OT for Packaging. Write opentxs.pc.in.

This is a combination of 3 commits.
-- The first commit's message is:

Begin packaging work.

-- This is the 2nd commit message:

Added src/opentxs.pc.in and set up Makefile.am to dist it.
Few configure.ac readability tweaks. Update linux install docs.

-- This is the 3rd commit message:

Added non-unix install docs back just in case ....

-- rebased by da2ce7 (orignal work by randy)
Creation of a sub-build system for libraries.

This is a combination of 10 commits.
-- The first commit's message is:

Begin sub-dir build system for libraries.

-- This is the 2nd commit message:

Make structure for libraries revamped.

-- This is the 3rd commit message:

More Makefile restructuring.

-- This is the 4th commit message:

Tidying up variable rationalisations.

-- This is the 5th commit message:

Added paths to headers for "$make dist"

-- This is the 6th commit message:

Formatting, readability, tidy up new Makefiles.
Added back old-build as tar.gz file in docs.

-- This is the 7th commit message:

Removed precautionary double calls to AM_CXXFLAGS.
Used safer path descriptor for libot.la.

-- This is the 8th commit message:

Explicit check for pthread lib.

-- This is the 9th commit message:

Set compiler flags for CPP and CXX to the same.

-- This is the 10th commit message:

Simpleini returns!

-- rebased by da2ce7 (cheers to randy for the good work!)
updated the windows build file for moa's work
Merge pull request #110 from randy-waterhouse/master

Swig wrap header rename for buildwrappers.sh
The gateway script only takes one CLA, not two.  Now it'll work.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Added a call to etc/rc.d/rc.avahiclient to rc.local.  It needs to be
started as well.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Fixed the path to dhcpcd.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Commented out calls to rc.[atalk,saslauthd,openldap,samba] because they're
not needed, and if they wound up in the file system somehow they'd
increase the size of the vulnerability footprint.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Commented out a spurious notice about dhcpcd.  Changed it to be
more accurate.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Added the rest of the converted Slackware wireless firmware packages to
the required package list.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Merged edits of rc.M and rc.local from the build VM.

Fixed a CLA counting bug in gateway.sh that wound up being a showstopper
during testing.

Merge branch 'master' of github.com:Byzantium/Byzantium
Added a command to install Byzantium/control_panel/gateway.sh along with
the rest of the control panel.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Changed the range of the final octet of the IP addresses generated for
the mesh interface to 1-254.  Reference ticket #138.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Merged fix to the module build script to install gateway.sh.

Merge branch 'master' of github.com:Byzantium/Byzantium
Initial commit of our hacked avahi-dnsconfd.action script.  I've torn
out the distro-specific stuff and left only the "edit resolv.conf"
stuff.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Converted the conditionals from the hacked avahi-dnsconfd.action script
into something more readable.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Updated debugging info that's supposed to be caught by syslogd.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Patch Avahi for Slackware

Corrects the avahi-dnsconfd.action script to work on Slackware systems.
Merge branch 'master' of https://github.com/Byzantium/Byzantium
Added a line to copy the custom avahi-dnsconfd.action script into the
fakeroot.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Needed to build .xzm modules
Updated the SQL query that gets names of client interfaces from
network.sqlite to encompass oddly named interfaces (/eth[0-9]*/i).

Signed-off-by: The Doctor <drwho@virtadpt.net>
Moved the service pseudo-users into 'nogroup' (from 'users') to keep
them from appearing on the KDE login screen.

Signed-off-by: The Doctor <drwho@virtadpt.net>
adding carl9170 firmware for atheros chipsets slackbuild
On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)
	modified:   RPi-status-update.sh
Danish locale
Merge pull request #95 from martinjlowm/master

Danish locale
added basic disk usage portle use flotr2, will be changing this later on, looks pretty ugly....

Ticket #23
New Project - TablaClaves
Adding advances on Menu views
proposed features
add ISO8859_1 for fat
Tiny edit to avoid the usual error with photo credits at top of post.
Add a paralax audience.
Zones no longer allow spaces

Whenever text is entered to the text box for a zone
spaces are parsed away and replaced with '_'
Merge branch 'develop' into multirange
create external resources
CHANGED: SBJson header added
Ensure that @mutations is always a Hash.
Expose @mutations
Doc.
Call respond_to? with the second argument.
Have Fuzzing.[] raise a NoMethodError.
Moved the logic of String#fuzz into Ronin::Fuzzing::Fuzzer.
Renamed Mutator#mutations and Fuzzer#substitutions to #rules.
Merge branch 'release/v0.3.7' into develop
Modify README
Update README
Merge branch 'release/v0.3.8'
Rebase from release/rostopic
+ Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 1.9.12
+ Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 1.9.12
+ Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 1.9.12
Rebase from release/rosservice
+ Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 1.9.26
+ Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 1.9.26
+ Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 1.9.26
Added a test curl request, just to google.com
Merge branch 'master' of https://github.com/rsacksteder/CS383Project
Add FizzBuzz spec
Merge branch 'master' of github.com:ruby-jokes/job_interview
let's not delete the tmp file to see what went wrong
Add post about my talk at RubyConf
Copy styles for links
added hiredis files (c client for redis)
+ convert to html, more friendly messages
SOLR-80 Add zipruby to unzip files for Solr setup.
SOLR-80 Add a new rake task to download and setup Solr and Jetty.
SOLR-80 Add clean task and add it to the `rake clean` task alias.
Add solr and jetty artifacts to .gitignore.
Make sure scripts are executable in jetty.
Merge pull request #55 from thecarlhall/solr-80

SOLR-80 Add a new rake task to download and setup Solr and jetty
adding ontopreplica folder again hoping to fix conflict
Modified core data manager to save policy form.
Modified source to fix bugs and memory leaks.
Finished Specs
Fix context that getUserMedia is called in.
removed 1.4 logging configuration
declared compatibility with django 1.4

- updated readme
- updated travis
Fix dependencies so it works without activerecord.
Merge pull request #215 from oriolgual/master

Fix dependencies
Fixed params for lt.add_magnet_uri
- Finished generic creation of interleaved structural and shear constraints
added ability to use create_* methods to application
I can't form coherent sentences, hence the change.
Enabled all relevant collectors with default values.
Merge pull request #6 from scottso/enable_collectors

Enabled all relevant collectors with default values.
Merge pull request #3 from att-cloud/master

Syncing up
Added login request/response
first pass at admin dropdowns
allow more than one dropdown per screen
fix case where no value is selected in dropdown
set connection name as default dropdown value
add dropdown for users list table

(query doesn't work yet)
Build for Market
Merge branch 'master' of github.com:scudderfish/MSLoggerBase
Reduce the churn when dragging things around
Don't allow things to be dragged off screen
Stick a flag on it
Add hooks for edit/add of dashboard elements
- NEW    : Example - call before after.

git-svn-id: https://svn.sven-drieling.de/repos/trunk/playground/php@82 9adaec3a-5a83-11de-93c2-a12fd72c8969
- NEW    : Example - restrict access to specific properties with an accessor.

git-svn-id: https://svn.sven-drieling.de/repos/trunk/playground/php@83 9adaec3a-5a83-11de-93c2-a12fd72c8969
init
First push
Merge branch 'master' of github.com:nextbigsoundinc/Android-1.0
Woops
Switching back remote URI
Added new settings for OSC including debug view, disable triggers and changing scenes and arrangements.
"Created changeset diagnostics-details-and-message"
sync exists in Debian initramfs
Rebuilt from Net::Twitter 3.18002
Coming soon initial commit
Implemented binding for loader.  Just using placeholder content inside the div.
Merge branch 'master' into LoaderAnimation
spaces
Merge branch 'master' of github.com:semmin/educators_network
Merged branch prepare-for-deploy
Merged master
removed older client gem
New gem version
wh.js tool
wh.js tool
wh.js tool
Revert "Command is accepted as valid, even if it is not technically allowed to run (as per config.yml options)."

This reverts commit 7efabf536f8a2b73a5330bb26450e50af34c91c8.
Revert "If coming from a previous version of MinecraftBot the config may not include the mckick and mcban options. This change helps to identify the issue so that server owners know where to look for a solution."

This reverts commit 9aab1d8f1e543ed13ffcf870c9d5ee14ecf3931a.
Should kick player after banning them.
Fault Collapsing

Fault Collapsing Hardcoded as it is fixed.
Also works for 3 input gates
add helper jsonify
update test cast
made it so that you can edit your own page
at: drop initscript dependency

* doesn't look like build dependency
* and for runtime dependency if needed we should use VIRTUAL-RUNTIME_initscripts

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Added Mobywash.ge
Fixed Terminal image
Adding ability to search with no criteria!
Imported contents from Facebook
added afacesFullDimParallel
TabooWord palvelua varten muokkausta
Merge branch 'master' of github.com:skottilaine/Ohtuprojekti
TabooWord luokka lisatty
taboopagella ei näy enää switch taboojutskaa
Merge branch 'master' of https://github.com/skottilaine/Ohtuprojekti
Confirm that the Haskell version of McBride handlers doesn't have a
memory leak.
Experiments with contro0, McBride handlers, and parameterised handlers
in OCaml.
moar bug fixes
merged with tim's fixes
polish calendar view
Compatibility with TYPO3 6.0
renamed stuff
damn old files
second batch, and an example
JBIDE-13099 gitignore for empty folder
JBIDE-12958 npe
JBIDE-12958 cleanup as per dennis max
working to discover test error
part of jbide-13098, cleanup after last commit
JBIDE-13098 part 2, DeploymentAssemblyFilesetReferenceTest
JBIDE-13098 remaining tests cleaned up
esb 4.11 not deployable jbds-2365
new added servers should begin in the synchronized state

Signed-off-by: Max Rydahl Andersen <max@jboss.org>
JBIDE-13136 server editor enablement after discussion with maximus

Signed-off-by: Max Rydahl Andersen <max@jboss.org>
JBIDE-13135 to branch
JBIDE-13135 to branch missed a commit
modified tests and logging as the PR indicated
update
wrong parent pom reference -- should be Alpha1, not CR1 (missed when bumping up my Max 'God Mode' Andersen as part of 4.0.x branch operation on Friday)
fix bootstrap profile to use 'jbosstools-' prefix
mv gallery word
more objc stuff
Authorization#scope should not be set to an empty string.
update about page with contact info and shorten text
maj sql
Merge branch 'master' of https://github.com/soufian-agea/Projet.AGEA
My FizzBuzz solution using ioMonad
removed Javiers old blog
replaced newRV() with newRV_noinc in Tweak.xs to avoid leaks
Update plugins/box/pages/languages/ru.lang.php
still missing inode for /0_0_0 directories
Added screenshots thumnbails for github
fixed hide statusbar in shadow mode (code got left behind somewhere!)
Resolved image taking force closes (missing static reference)
Added no-gps, force-stop (via home button), and recording-timed-out dialogs as activities
Merge pull request #239 from stowellm/ms237

I hate menus.  But we can use menus on phones.
Merge pull request #240 from stowellm/ms237

Finished skeletal layouts for app, still no menu though
Started building functions for uPPT file browsing
Ready for merge
Merge complete
Merge pull request #241 from stowellm/ms237

Menu items complete (still not showing), UI fully updated.
Made the checked text clickable
Merged files with Mikeclear
Merge pull request #242 from jaypoulz/jp237

Now we can see your sd card... muahahahaha *cough*
oops layout files
Merge pull request #243 from jaypoulz/jp237

oops layout files
Menu works - proper holo themes and nice backgrounds
excercise 2 finished
fixed doi
Site updated at 2012-11-13 06:12:53 UTC
Strategy Context + DEBUG
jquery tweakings
added a simple counting sort example
first commit
second commit
third commit
fourth commit
Merge pull request #2 from swati1591/master

Hi. Here's the latest version of the code :)
fifth commit
sixth commit
seventh commit
Merge pull request #3 from swati1591/master

This is the code with the today's modifications
eighth commit
Merge pull request #4 from swati1591/master

one small modification...it worked so far...but that was because we had less than 5 worker nodes till now...it was comparing the strings instead of int value...now this will work fine
Merge remote-tracking branch 'upstream/master'
ninth\ commit

Signed-off-by: swati1591 <swati1591@gmail.com>
adapt to the new mode state object
Added test with error.
Ports modified to run on local
Vastly improve MRU hash performance by storing per-session hashes

Previously, every time PhotoDemon needed to access an MRU icon, it would
request a hash of the MRU path in question.  As SHA-256 hashing is
computationally expensive, this led to a lot of wasted cycles.

With this update, every hash from the current session is remembered.
When a hash of a file path is requested, the MRU handler first checks
its list of hash requests processed this session.  If a path has
previously been requested, the last calculated hash is returned (instead
of calculating it again).

Much better.
RETIRED / DEPRECATED notice
use `Extension` instead of `cythonize` since that seems to be working to build binary RPMs
updated rake gem 10.0.1
updated ignore for config files
removing files from git
fix low volume issues with a few effects for toro
adds supported modes to readme
display correct time
adding customer and street count to transformator
sync
Site updated at 2012-07-06 15:57:16 UTC
Add monitor sensors and windows
Minor logic error in bootstrapping.

App should wait for remote data to write.
A fix is in, but it doesn't quite work.
Major changes to the way tables data is stored. I think it works now.
Final tweak to DeviceStorage to make everything work.
Spec fixes.
Used dojo function to replace redundant code.
Adding specs and cleaning up functionality a little more.
Oh, JSHint.
More descriptive variable names.
Device Storage must be cleared in some tests now.
Minor formatting fix.
Merge pull request #569 from futuraprime/bootstrap-hotfix

This fixes the issue with the bootstrapping process and OTAs.
Merge branch 'develop' of github.com:Toura/mulberry into f-admob
Added IDs to grid view
Added url of git repo to URL
Personalised the readme file
Testing GTK Interface
Game trees and p03consolemerels ready to go
shorthand fixed for disqus
repo count github
slightly more writing
hobotracks
generate haml instead of erb templates
User scaffolding
Convert main layout from erb to haml
Add language and encodings in main layout
Add functionality for Login/Logout and Sessions
Use rspec for tests
Upgrade to Rails 3.2.8
Add name field for users
Fix HAML indentation and password fields type
Login/Logout -> Signin/Signout
Add tests for user listing and signup pages
Annotate models and fixtures
Move HAML out of the development group
Add validation rules and tests for user model
Annotate rspec test for users
Add index on email column
Add license file
Add tests for user password
Tests user authentication return values
Remove redundant authentication method
initial commit with cucumber and rspec
fix manifest; bump version; try again
Added tag 1.501801 for changeset 008a31497c07
Add QJM change for format()

Wire QJM.format() rpc

log message when formatting

Throw JournalNotFormattedException when using unformatted journal

Fix QJM.format() to wait for responses and throw exception on failure

should call checkFormatted() when requesting edit log manifest

format() API should throw IOE

Hook up format() RPC in JournalNodeRpcServer

Implement hasSomeData() for QJM

Stop auto-formatting on first access (unit tests probably broken now)

Fix testMismatchedNNIsRejected now that format isnt automatic

Fix TestQJMWithFaults for non-autoformatting

Fix TestJournal for non auto-format

Add format call for TestEpochsAreUnique
Add some test infrastructure to allow tests to be more deterministic (not in use yet)
Cleanup some formatting of QuorumException stringification
Use a deterministic order for TestQJM
Improvements to fault test:

- unwrap exceptions when they're thrown by the reflection-based proxy
- don't assume that we will recover exactly to the last acked seqno + 1. Instead, we should recover to *at least* that
Fixes around crashes right at the start of a segment
Validate journal dir at startup

Some fixes to pass absolute file in MiniJournalCluster
Add test to TestJournal for finalizeLogSegment edge conditions
* Fixed non debug builds.
Ajout de la plupart des JButtons
Site updated at 2012-12-29 23:02:41 UTC
Site updated at 2012-12-28 09:14:38 UTC
merge "GlobalActions: hide power menu before showing it again"

This patch stops multiple power menus popping up when
long pressing power more than once.

Change-Id: Icf93a3c8d6d486c29e9b36308d553b30885179cf
easier on themers [sethyx]
Support Node.js '>= 0.6.6'
NSPSUPPORT-103: Databaseskema kan nu køres på eksisterende sdm3-skema uden runtime-fejl
NSPSUPORT-103: Opdater parent-afhængig til stable før release
Merge branch 'master' of github.com:trifork/sdm4-cprimporter
pyconjp-2012-dvcsの更新
Update from_pcm() classmethods to take Python encoders.

This allows WavPackAudio, ShortenAudio and ALACAudio to use
their respective Python-based encoders for testing.
Add very stripped-down tests for Python-based FLAC codec.
Add unit tests for Python-based WavPack codec.
Add fixes and unit tests for Python-based ALAC and Shorten codecs.
Lots of cosmetic fixes for PEP8 compliance.
Cosmetic fixes to utilities for PEP8 compliance.
Bump version to 2.19 beta 1

Although there's a number of minor issues left on the TODO list,
this version can be considered feature-complete
and any new major changes will be put on the 2.20 list.
test task追加
moving launch file into launch dir
get an annotation, delete an annotation stream, some docs
adds files to .gitignore. Replaces some libs with the non minified file
Prepare for UTPC2012
Note for the jackass guy
update markdown files.
Add images.
added habrahabr profile
Modifed ErrorPopup to accept detailed message in addition to exception

Deprecated BudgetSource.getBudget() and replaced it with retrieve()

Added checks for file presence and readability before reading.

Also modified error popup to only show detailed stack trace
for exceptions with a cause (i.e., an exception converted to a
BudgetSourceException)

Added error popup on error saving budget. Added error checks to persist()

Removed deprecated functions
Merge branch 'issue-142' into develop. Closes #142
notices viewlet & hiding
rebooting web.config one last time
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Twitter API call and links are now protocol relative
Merge branch 'master' of github.com:imathis/octopress
Using https instead of protocol relative urls, for Pinboard and Twitter feeds
Disabled Rsync delete by default. Closes #787
To support url without domain name like /path/file

You need to know if you would like to support this, each word in the title can not start with "/".
Fixing English error pet-peeve.
Merge pull request #831 from parkr/english

Fixing English error pet-peeve.
Rakefile option for any additional rsync arguments

Added variable `rsync_args`
gist tag plugin now works with the latest changes GitHub gists and does not fail if you do not specify a filename.
Merge pull request #824 from liangsun/patch-1

To support url without domain name like /path/file
Merge pull request #844 from jsvensson/rsyncargs

Rakefile option for any additional rsync arguments
update octopress
two shell one liners post
Readme updated.
Merge pull request #1 from VladoBrigant/master

Test pull request.
add api for create and joib projects
. implement project can add remove user feature
. add assign support, so we can assign task to somebody
change unittest
. add logoff support
Merge branch 'daily_li_0803_4' of git://github.com/lizhe5/TaskManagement into daily_wang_li_liang_0803
added
edit
Merge branch 'COST'
modificato regole 600MHz
Merge branch 'prenotazioni'
aggiunto sezione events in COST (ed evento)
Move PZP config file content checking to later stage

Jira Issue: WP-320
Merge pull request #183 from ziransun/WP-320

Move PZP config file content checking to later stage
由source重新生成所有页面，改动见source分支(07de28211c)
create GUI elements from copter response
Fix Metatag Bug #650
Fix Metatag Bug
Merge pull request #655 from sylus/master

Fix Metatag Bug #650
add another output for visualization
(bug 457) use semantic headings for the navigation menu

This changes the current scheme of using (varies per skin) <h4>, <h5>
and/or <h6> tags (with nothing apart from the main <h1> above them in
the hierarchy) to <h2> above the entire navigation and <h3>s as portlet
headings.

The <h2> is hidden for normal browsers, but accessible for screen-readers
or text browsers. Its content comes from a new message called
"navigation-heading".

The changes were applied to Vector, Monobook, Modern and CologneBlue. The
change to Monobook also resulted in the heading appearing in Chick and
MySkin (I intentionally didn't implement hiding it in these skins, as they
are intended respectively as a super-lightweight one and a skim "template")
and in Simple (where I did hide it, but didn't bother with further CSS fixups).

Related changes and technical notes:
* Monobook had various styles for apparently all heading levels inside of a
  .portlet, but only <h5>s (now <h3>s) could ever be generated.
  The styles were also ancient, straight from 2004 (I git-blamed),
  so I removed them, as they were almost certainly completely unused.
* Modern lacked font-size for .portlet h5 (now h3). It worked mostly okay
  before (font-size of h5 is similar to size of regular text), but after
  headings were changed to <h3>s, they became too large. I used
  font-size:0.83em (copied from Opera's user-agent stylesheet), but this
  might result in slight font-size changes on various browsers.
* Vector's variant menu is deeply broken. I changed the bonkers structure
  to two <h3>s, one with id=mw-vector-current-variant. This is still
  broken, but I don't really know how to do it properly.
* In Vector's CSS, the height for div.vectorMenu h3 a (previously h5 a)
  had to be changed. I used 1.9em, the same as used for div.vectorTabs li a,
  but this probably shouldn't be measured in ems anyway.
* CologneBlue and Vector lacked wrappers over the entire navigation;
  I added <div id="mw-navigation"> to both of them. In CologneBlue this
  also required moving <div id="toplinks"> to the bottom of the generated
  HTML, which is a good idea anyway.

Change-Id: I9a2ebd503ec9dd901802a9b3b1f5137a85990373
Merge "(bug 457) use semantic headings for the navigation menu"
remove some unused files and clean up command-t
added icon pictures
inserted month in front of the first date
fixed updating category error
add uglify to package.json
Honestly, I don't care about Microsoft Core fonts
Refactor controller to be more event oriented
Move filtering for tags to server side
James C - moved scheme files over
James C - started into conversion
James C - started denotation
James C - continued denotation
add support for new backup suite
Style changes for the embed-teachhub view and the footer of the embedded search.
added evaluation on 'constant' closure
Site updated at 2012-12-11 16:03:36 UTC
- merged proofread texts 


svn path=/trunk/live-installer/; revision=67784
add images, style and js
修正语法和结构问题
demo_4.0 commit
t4_arhipov
changed requirements
use 0 for setTimeout next tick trick
Rotate on touch
Updates to release process/scripts

- Fixed issue in composer packaging to ensure full library of ZendService*
  packages is copied
- Ensured package lists are up-to-date
- Updated README with correct order of script execution
Fixed pyrus release scripts for external packages

- it now merges core and external packages to create the list of what to build
- fixed the regex in release-package.php to be more liberal. Actually, simply
  removed it and now look for a non-empty argv[1]
[2.0.0rc1] Updated index.html with rc1 package lists
Removed target-dir

- was causing issues with autoloading

Conflicts:
	public/packages.json
Fixes for composer package creation

- External packages were not installing source in the correct directory;
  this fixes that issue.
Fixed composer package naming

- Pull the package name from the composer config, instead of using the
  filesystem basename
Merge branch 'master' into production
Added schedule for filter enhancement proposal
Added missing configuration for building on linux
Finished first draft of homework 4.
add yes and no to config
一个完整的jekyll例子，感觉不错
图片和文章列表
集成kendoui
moved grow_bbox_to_int out of Image/Transform.h and into Math/BBox.h

also updated to use ceil()
add double offset support to GeoReference crop
Photometry changes

* But fixes for tiling
* Use less memory
Merge branch 'master' of https://github.com/visionworkbench/visionworkbench
Merge pull request #22 from khusmann/master

moved grow_bbox_to_int
Math: Fix grow_bbox_to_int to handle float max() correctly

The correct solution is to use floor+1 instead of ceil. Otherwise the
output bbox will not contain the max values of the floating point
bbox. I've added unit tests to prove this point.

This also adds a smarter grow_bbox_to_int that does not cast to double.
Eject the cache before performing mipmapping

Usually a person uses DiskImageView to insert into the plate. That
device will max out the cache. Our mipmapping section doesn't use the
cache object so it never deletes DIV cache objects. This means we're
at least doubling our memory requirement.

This is a dis-tasteful hack where I resize the cache to near zero to
clear it. Then mipmapping can do its own thing.
WIP: fileio: Jam MIR OpenEXR to only save using Imf::Half

Imf::Half is their custom 16bit floating point type. I need
compression desperately that I can take the hit in precision. This a
WIP commit because it doesn't allow the user switch between Half or
Float types.
cartography: Have spherical datum's inv flatten written as zero

The OpenGIS Implementation Specification: Coordinate Transformation
Services 12.3.10.2 states that for spherical datums, the inverse
flattening must be written as zero. ArcGIS and common WKT projection
strings seem to be following this. There was also a user
outcry. Mooot.

There is also some formatting fixing in here.
math: Added exp, log, log10, cosh, sinh, tanh to Vector

This also makes a nicer looking header that uses a macro and defines
the type for both VectorBase and VectorTranspose.
Image: Allow Translate and Resample Tx to accept vectors

Just less code else where.
added logo - raw version
loading story
Fix missed debug option
Added support for a suffix placeholder in settings file.
suppression de toto.tex
Converted erGetUserAvailability from e4x to xml2jxon

Signed-off-by: Michel <info@1st-setup.nl>
[Issue 370] Remove unnecessary dispatch_retain for dispatchGroup in enqueueBatchOfHTTPRequestOperations...
Fix #162 (spea)
Fixes turning to 0 when holding button after movement stops
No spaces before/after parens
First steps towards a new admin
Refining the list table view
Adding settings to the base class
New admin options page
Removing JS and CSS -- no longer needed
Adding a success message to the admin
Working front end with the post type container
Add prio to the content filter
Refining the front end functionality a bit
Updating readme
Cleaning up the list table a bit more and fixing some meta boxes
Changing NetworkSystem
ahora esta el ejemplo de como se usa la clase Canvas
Added suggestion about playing by yourself to README.md
Revert "Revert "Add documents""

This reverts commit 2807a350f367690025cfb2aad8e034f3d37f2e64.
Ungenutze datein gelöscht
New test for app details page
https://moztrap.mozilla.org/runtests/run/243/env/112/ - TestCase: "Verify details page for an app"
test_details_page.py
Split the test in 2 tests
Addressed all the review comments
removed duplicate code
[mobile]Removed xfail for test_user_can_click_back_from_settings_page
https://bugzilla.mozilla.org/show_bug.cgi?id=814372 - Back button doesn't work from the settings page"
is marked as resolved and the test is passing.
Fix for TestConsumerPage.test_that_verifies_categories_section
Updated Category locators.
Merge pull request #192 from AndreiH/fix-categories-section

Fix for TestConsumerPage.test_that_verifies_categories_section
Merge pull request #191 from teodosia/remove-xfail-back-btn

[mobile]Removed xfail for test_user_can_click_back_from_settings_page
Merge remote-tracking branch 'mozilla/master' into new_tst
readded deleted locator
[mobile]Replaced the app used for testing to Bimmer
Merge pull request #186 from AlinT/new_tst

[mobile]New test for app details page
Merge pull request #195 from teodosia/replace-test-app

[mobile]Replaced the app used for testing to Bimmer
Merge remote-tracking branch 'mozilla/master' into fix-test-categories
update testcases for EaselJS
Changed template file home.ctp
Добавил файл с возвращаемыми данными.
Doesn't quite work yet.
Signed-off-by: Harrison Houghton <actorclavilis@gmail.com>
Fixed motion.
Signed-off-by: Harrison Houghton <actorclavilis@gmail.com>
Fixed swapped rotation
Signed-off-by: Harrison Houghton <actorclavilis@gmail.com>
Fixed motion.
Signed-off-by: Harrison Houghton <actorclavilis@gmail.com>
Merge remote-tracking branch 'origin/refactor' into refactor
Merge branch 'refactor'
Merge remote-tracking branch 'origin/master' into TankClasses
max-width on main content

edited stylesheet
* Updated screenshot.
Give fix (#628), some silly compile fix.
Fixes for: #663, #661, #658, and #628
Merge pull request #665 from SkyMarshal/Airlocks

Fixes #663, #661, #658, and #628
Fixed body scanner - was missing icon.
Fixed a bug with the rp-rev convert verb.
Fixed an issue with the automated rev addition.
Merge pull request #1796 from CIB/master

RP Rev Fix
Support for new questions and memory leak fixes
1. Support display of new questions on the site. There's more to add, but basic infra exist now.
2. Fixed many issue of memory leaks in many modules.
Added licensing for new files
Added more attributes regarding variants and genotyping.
Update German/main/Browser.apk/res/values-de/strings.xml

Completely translated from scratch
- added Eclipse Feature project
- added Maven parent pom
Rename django_nonrel to django. Bump version.
Add stupid final to version.
LPS-27228 Source formatting
LPS-27228 Source formatting
LPS-27303
LPS-27303 Language keys
LPS-27307
LPS-27307 Forgot constructor
LPS-27286 fixed missing trailing }
LPS-27286 Remove extra line break
LPS-27306
LPS-27306 Source formatting
LPS-27161 Forgot to deprecate method, so caused LPS-27300. Fixed it in core by deprecating method.
LPS-27321 Use ConcurrentHashMap instead of HashMap in Jackrabbit StringIndex implementations
LPS-27321 Regenerate
LPS-27312
LPS-27317 Ensure RuntimeTag thread safety under parallel rendering context
LPS-27317 Source formatting
LPS-27161 LPS-27300 Source formatting
LPS-27200 Jetty needs JNDI
LPS-27087 user's name was double escaped
LPS-27058 It is needed after all. chat-portlet is redeployed while test-clp-portlet is not. Need to reset handle.
Thinking about how to handle futures returned from the CUDA backend.
Add force method. Remove which_to_back.
Update force() to operate with places. Remove localize/banish/is_clean.
Create the game
"deploy"
#300: Add per-object view creation + tests
issue #384 - grouping preserved in loadimages converter + test
Collision altered to be based on anchor point
Merge branch 'Jonathan-Work'
stuff
Merge branch 'Balancing'
stuff
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
stuff
Almost fixed Recon Map
Made it Blue!
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
stuff
Buttons

Signed-off-by: JPBarker <joseph1.barker1@gmail.com>
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault

Conflicts:
	armored assault/Source/GameOverState.cpp
Merge branch 'rob_testing'
game over fades in,
fixed a bug where you couldn't escape out of menu screens because of joystick input.
Removing community assets table using table reloaded class
Modified Template Name and fixed AppDelegate
added basic result check implementation #4