labofsahil/github-event-dataset-2012 huggingface dataset:
early morning updates
conditional execusions of rvm and perlbrew
add rbenv path and set EDITOR
use PROPER* shell key bindings

*) vi that is :)
More require fixes
README fix
Remove dead code
Remove dead test
Extract curl related code to proper place
Start work on documentation
Typo fix
(Re)Discovered bot freeze bug with dutchmeat and fixed it using
Redeye's bot check refs #86
cgame: localisations clean-up and adds refs #132 announcer sounds refs
#99
Ajout du texte d'accueil et de la charte
Fix for issue with quote printing dark in some browsers.
Add pathogen plugin
Merge branch 'master' of github.com:fabienengels/home
With the hidden files
Patch 'unix:filemode' property as 'svn:executable' in SVN

Summary: Patch created on Git contains 'unix:filemode' property which is useless in SVN.

Test Plan: Exported a bundle changing a file to executable in Git, applied it in SVN, verified that the file is executable.

Reviewers: epriestley

Reviewed By: epriestley

CC: ptarjan, aran, Korvin, digoangeline

Differential Revision: https://secure.phabricator.com/D3554
Remove "--no-decorate"

Summary: Apparently my advice here was terrible, and `--no-decorate` and `--decorate=no` are both very recent additions to Git which a bunch of users don't have. Get rid of them since D2344 allows us to parse all decorate levels anyway.

Test Plan: Tried to google "git changelog", got a bunch of pages about managing changelogs with git.

Reviewers: zeeg, ehren

Reviewed By: ehren

CC: ehren, aran, NorthIsUp

Differential Revision: https://secure.phabricator.com/D2354
Tests still dont run on py2.6 but the web server and everything else does (i think)
* Changed default to no spacecmd support
SM
* Made spacecmd off by default
* Removed old default list logic
* Fixed bug where /tmp files created by root were left laying around
SM
* updated default list
SM
README updated with wiki-link
Mon premier commit
Revert "Mon premier commit"

This reverts commit 32f29669d0407e5e63da7cc531a0c3967b7e886d.
Mon premier commit
moved json utility function to their own file (json-utilities.c)
Merge branch 'devel' of https://github.com/triAGENS/AvocadoDB into devel

Conflicts:
	configure
update
Merge branch 'devel' of github.com:triAGENS/AvocadoDB into devel
uniquification, intersection and union of json lists
Merge branch 'devel' of https://github.com/triAGENS/AvocadoDB into devel
style/sliderbutton
Merge branch 'devel' of github.com:triAGENS/AvocadoDB into devel
fixed ifdef
Merge branch 'devel' of https://github.com/triAGENS/AvocadoDB into devel
fixed memleaks
fixed GCC 4.6.3 compile warnings
added some tests
added tests
more test cases
Merge branch 'devel' of github.com:triAGENS/AvocadoDB
added configuration
Fix incorrect time in World Clock
fixed a bug where int16 got truncated to uint8. sound is good now.
cleaned code up a bit.
Removing r-build script
fix activity bug
updated some tooltips
minor changes
updated version
pep8 and fix for hashring on lazy connections
Fix for issue #42
Merge branch 'master' of https://github.com/jHoldroyd/FireSALE
General fixes and for issue #50
Initial dev commit
Base of PayPal checkout button
Merge remote-tracking branch 'remotes/origin/development'

Conflicts:
	firesale/controllers/admin_gateways.php
	firesale/controllers/front_cart.php
	firesale/libraries/gateways.php
	firesale/libraries/merchant.php
	firesale/models/products_m.php
added asynccommand
add more rails snips
replace ack with asynccommand
Allow subtype of 1 or 2 for ip_mask get
Add ex 1-9
Limited the track kind values to "audio" and "video" only.
Fixed EOF in extract
Merge pull request #53 from flyicewolf/master

* Create ChildServiceDelegate.java to delegate the method between child & ApplicationMaster
* Add counter basic skeleton
Merge pull request #58 from flyicewolf/master

Add getAllCounters method of Job
#60 Each task vertex in job graph should assign different local resources
Merge pull request #61 from coderplay/minzhou

#60 Each task vertex in job graph should assign different local resources
Add the default value of STAGING_DIR
Merge remote-tracking branch 'upstream/master'
Fix the stagingDir bugs , delete the extra constant variables
fixed bug in calling certain endpoint too much
added Maki icons
Update font css regenerator
Update embedded fonts
don't need this
don't need this
my changes
Removed dependency to the forge-git-tools, which were never provided
adding build.xml and foundry binary
modified:   frmcitas.py - Se corrigio el bug el cual al cerrar el form
el video seguia funcionando
modified:   lista.pls - estaba mal escrita la ruta hacia los archivos de
la lista
fb intergation improve
rollback
blah
new file made!
added additional validation logic for upcoming products
make sure findDistributeTarget is in local scope
trap null prototype in call to HTMLElementElement.component
register a MutationObserver for subtrees that use bound events so newly formed DOM can be bound (e.g. MDV template stampings)
Merge pull request #19 from frankiefu/master

tabs component, simplify togglebutton and more unit tests
null checks for 'root'
Merge branch 'master' of https://github.com/toolkitchen/toolkit
DOMTokenList.enable was renamed to toggle at platform
Merge pull request #20 from sjmiles/e334f1293f394165dd1e53e7527bc624f99ec4f7

use MutationObserver to maintain custom event bindings, bug fixes
Merge branch 'master' of https://github.com/toolkitchen/toolkit
Merge pull request #21 from sjmiles/master

"DOMTokenList.enable" was renamed to "toggle" at platform, update polyfill
configure Postgres for travis
start of tokenizer
Bumping multi_json dependency
camera and post updates
work from last night
init_overlib keeps track of not re-initializing inefficiently itself now, RT#18338
Using jQuery for DOM manipulation.
about page update
Merge branch 'master' of github.com:friendlycode/wmgg
fixed bug where the debug console would hang if you entered it multiple times
fixed bug where the debug console would hang if you entered it multiple times
Replaced forest falling leaves with a new particle-based system (rather than objects-as-particles), and tweaked the speed of the deadly-pit particles.
Revert roof-fix unfix for Dux Duo.
Revert "Made gold coins run away from Frogatto on 'unfair' difficulty."

This reverts commit 925d93fb4e7a6049f3bb53461ff7c0fd981b4667.
Made gnarled-knoll's jump puzzle less perversely difficult.
Centered the SELECT DIFFICULTY LEVEL: text controller
made it so Frogatto 1.3 will ignore save files from Frogatto 1.2 rather than crashing
Store the player's events in the invisible observer, so if the player has already opened one of the two gates, they see it being open in the cutscene.
Some additional polish on the soda machine, and put on in chopple's shop.
glorious funtoo updates

merged:

  gentoo: 833a9bded63d50df491506b2e82f0ec4089b7e8d
  funtoo-overlay: 42a271b5dd70ce941e4d9c989e33dfd09f888e70
  foo-overlay: 2f3764da8e07ba02a7aa067bd519812eefb1d46f
  bar-overlay: fb087c5a693ccc4195a2b824a60290a724802b2c
  flora: ad574acd6e80be516eb1e7c8812bbf9c2c0feb9c
minor improvments on collision with areas
mongo update/delete mass statements
Fixing margin for mobile
fix an issue where jsio wasn't global in the repl

In the repl or when using the jsio commandline utility, we want
jsio to be global - this is no longer the default when requiring jsio in
node so we need to do it explicitly.
Merge branch 'bugfix-global-jsio' of github.com:gameclosure/js.io into bugfix-global-jsio
only set Content-Type once
Commit bump: full questionnaire, search registry.
Add readme.
actions. panes. makefiles.
Merge pull request #223 from gaohoward/Branch_2_2_AS7

Branch 2 2 as7 - Updating User's manual: Adding Francisco to the developer list 
HornetQ-819 STOMP Web Sockets

* upgrade to Netty to io.netty 3.4.5.Final
* fix WebSocket handshake by using Netty websocketx Handshaker
* fix performance by using binary Web Socket frame and discarding the
  whole WebSocketStompFrameEncoder ugly hack
* update stomp-websocket JavaScript to latest version
  (d1f600611e) from
  https://raw.github.com/jmesnil/stomp-websocket/master/dist/stomp.js
Merge pull request #226 from jmesnil/HORNETQ-819_Web_Sockets_upgrade_AS7

Hornetq 819 web sockets upgrade as7
HORNETQ-940 - throwing an NPE when checking the bridge topic
Merge pull request #240 from jbertram/HORNETQ-940_AS7

HORNETQ-940 - JMX Topic Attributes Not Available in Cluster
fix a regression caused by JBPAPP-8017 JBPAPP-9332
fixing classpath on eclipse
adding some logging - JBPAPP-9232
https://issues.jboss.org/browse/JBPAPP-8942 - fix and test
Merge pull request #254 from clebertsuconic/Branch_2_2_AS7

Changes from support cases
updated to next snapshot version
Merge pull request #258 from andytaylor/Branch_2_2_AS7

updated version
HORNETQ-952 - fix connector bound to 0.0.0.0
Merge pull request #276 from jbertram/HORNETQ-952_AS7

HORNETQ-952 - correct a Netty connector whose "host" is "0.0.0.0"
HORNETQ-946 - add details to CONSUMER_CREATED and CONSUMER_CLOSED notification messages
Merge pull request #285 from jbertram/HORNETQ-946_AS7

HORNETQ-946 - adding additional details to CONSUMER_CREATED and CONSUMER_CLOSED notifications messages
HORNETQ-948 Unsupported CF properties in Resource Adapter

* add missing CF properties to Resource Adapter class
* add test comparing properties between HornetQConnectionFactory
  and HornetQResourceAdapter
Merge pull request #291 from jmesnil/HORNETQ-948_unsupported_CF_properties_in_RA_2_2_AS7

[2.2.AS7] HORNETQ-948 Unsupported CF properties in Resource Adapter
do not flag hasBeenUpdated in the getter methods
Merge pull request #306 from jmesnil/RA_hasBeenUpdated_fix_2_2_AS7

do not flag hasBeenUpdated in the getter methods
make man file available in vim
adding syntax highlighting for scala
Fixing formatting issues in readme
ubuntu12
Changed string format specifiers for NSUInteger values from %u to %lu

Resolves two compiler warnings in AFHTTPRequestOperation.m and one in AFHTTPClient.m
jmx check added
Changes needed for better support Oracle10g. Only comments, not actually modified files.
It would be great if we can make some kind of *if* on the code checking if the Oracle native libraries are "assembled" in the project and therefore use them.
fixed button margins in CASControlPanel

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17225 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Fix


git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17226 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
fix for #2558

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@19689 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Enhancing localization support


git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@19690 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Async Network: bug with 'My Books' opening has been fixed
updated TODO
Network: do not show 'timed out' message if some catalogs failed the search
Network: showing 'my books' and other items in litres catalog even if user is logget out has been implemented
Network: independent logins list using  for each catalog has been added
Network: do not show 'authentication failed' dialog after pressing 'Cancel' button in authentication dialog
Network: hide 'loading' animation while authentication dialog is shown has been added
Merge branch '0.99' of github.com:geometer/FBReader into 0.99
fix for memory leak submitted by FredChen
Merge pull request #10 from moovida/master

fix for http://jira.codehaus.org/browse/GEOT-4235
Deprecate feature collection methods that assume an in memory model as per GEOT-4181

git-svn-id: http://svn.osgeo.org/geotools/trunk@38830 e5c1c795-43da-0310-a71f-fac65c449510
depreacte CollectionListener methods

git-svn-id: http://svn.osgeo.org/geotools/trunk@38831 e5c1c795-43da-0310-a71f-fac65c449510
Update javadocs with an example using FeatureIterator and remove some notes for future GeoTools 2.2 plans.

Signed-off-by: Jody Garnett <jody.garnett@gmail.com>

git-svn-id: http://svn.osgeo.org/geotools/trunk@38832 e5c1c795-43da-0310-a71f-fac65c449510
Add multiplier update task
Skip spec testing Kernel.abort on JRuby
Crossplatform support and code fixes.
First draft of authentication handling
Updated HashUtils to make SHARED_SECRET public (temporarily)
file1 added and committed
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Reordered developers seeds a bit. Now seeds faster and has valid post-receive files
Add map dimensions to MapState class
Creation test JUNIT
maj
junit tests
junit
tweaks to error message.
a example page for triple destaque
a example page for triple destaque
testing with triple slide
making work with slide triple and better documentation with bootstrap e google code prettry
now using gist to code examples
trying to put delay in triple slides
add reversion to anmeldung stuff
Replace GPLV3 MD5 with OpenSSL MD5

Ric asked me to look at replacing the GPL licensed MD5 code with
something better, i.e. perhaps faster, and with a less restrictive
license, etc. So I took a couple hour holiday from working on
wrapping up the client_t and did this.

OpenSSL (nee SSLeay) is released under the OpenSSL license, a BSD/MIT
style license. OpenSSL (libcrypto.so) is used on Linux, OS X and *BSD,
Open Solaris, etc. IOW it's universally available on the platforms we
care about. It's written by Eric Young (eay), now at EMC/RSA, and I
can say from experience that the OpenSSL implementation of MD5 (at least)
is every bit as fast as RSA's proprietary implementation (primarily
because the implementations are very, very similar.) The last time I
surveyed MD5 implementations I found they're all pretty much the same
speed.

I changed the APIs (and ABIs) for the strong and weak checksums.
Strictly speaking I didn't need to do that. They're only called on
short strings of data, i.e. pathnames, so using int32_t and uint32_t
is ostensibly okay. My change is arguably a better, more general API
for this sort of thing. It's also what bit me when gerrit/jenkins
validation failed due to glusterfs segv-ing. (I didn't pay close enough
attention to the implementation of the weak checksum. But it forced me
to learn what gerrit/jenkins are doing and going forward I can do better
testing before submitting to gerrit.)

Now resubmitting with a BZ

Change-Id: I545fade1604e74fc68399894550229bd57a5e0df
BUG: 807718
Signed-off-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.com/3019
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
core: Made lkowner_unparse use 'type-safe' format-specifier

Change-Id: Ibd39edb5fccef525f7f0929401f7329508c59ced
BUG: 767229
Signed-off-by: Krishnan Parthasarathi <kp@gluster.com>
Reviewed-on: http://review.gluster.com/2907
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Fixed some compilation errors on MSVC; Added tests for equality when the URI strings are invalid or empty.
check tape on which the character is read in any case
Add emacs daemon usage to speed up emacs starting
Add fb autocomplete/tags
Add column number mode to init.el
Merge
Documented doWrap(), doTag(), doLabel().
Moved doWrap(), doTag() and doLabel() to txplib_html.php.
Add Panel Discussion speakers
なんかインデントが
test du script fabric
Add SW017b.jpg
Published to npm now, updating readme
add vim-html5
rulegen
Merge branch 'rulegen'

Conflicts:
	scihack.js
show qualification times for each discipline.
enable results form for relays!
update email on winners
CS changes
more CS changes
Correct error in spec files path
Reference local cowsay/cowthink perl scripts and cow files
Moving shell auto-completion code from grunt to grunt-cli.
Bumping version to 0.1.4 and publishing to npm.
added a correct model
added macros
added missing ++
Added verification meta tags for Google Analytics
fixing omniture issues with local tracking being duplicated, and swapping params for correct handling of ajax/internal links to avoid 500ms delay
refactoring navigation a little - combined some CSS and rewrote some JS to be a little more performant. also built in non-JS version of nav. still needs a few styling tweaks but otherwise good to go. nb. still need to finish edition switch logic
Merge branch 'master' of github.com:guardian/frontend
Fixed broken tests
Removed broken 'more' links from front.

These can be put back in the Front work
Put hashed version of png files in CSS (unhashed versions do not upload with deploy)
Fixed edition switch in sections dropdown and added latest list of sections from Chris
Merge pull request #65 from guardian/simple-nav

Fixed edition switch in sections dropdown and added latest list of secti...
adding styling for footer nav components and moving nav stuff into the container so we have one set of margins for page
fixing merge
Fixed broken tests
Merge pull request #66 from guardian/simple-nav

Simple nav
Merge branch 'master' of github.com:guardian/frontend into svg

Conflicts:
	common/app/assets/stylesheets/theme/_theme.less
	common/app/views/fragments/navigation.scala.html
Wrote tests to check the de-duping across the network front

The rule is that if no blocks are expanded I should not see a duplicate trail.

If any blocks are expanded then I can see a duplicate trail.
Updated how we handle image captions.

Content API is being changed and this allows us to simplify a little.
Added all-sections statis page, including assoicated: controller, routes and views
Merge branch 'master' into all-sections
Merge branch 'master' of github.com:guardian/frontend into image-changes

Conflicts:
	common/app/views/support/package.scala
Core navigation now supports our own stack as well as the current one.
Merge pull request #124 from guardian/core-navigation-urls

Core navigation now supports our own stack as well as the current one.
Converted ampersands to html entities
Removed unnecessary imports
Tweaked the sections layout as per disscussion with chris.
Merge pull request #123 from guardian/all-sections

All sections static page
making survey link open in a few window
Fixed breaking test for front.

Trailtext was not cleaned properly (it can have a link in it)
Fixed breaking test for articles.
Merge branch 'master' of github.com:guardian/frontend into image-changes
Fixed caption padding issue caused by change to how images are handled in content api
Changed In body tests to take account of the new format in the api
Changed CODE and PROD core navigation URLS so they work with our new stack
Merge pull request #129 from guardian/code-urls

Changed CODE and PROD core navigation URLS so they work with our new sta...
Merge pull request #128 from guardian/image-changes

Image changes
Fixed 404ing sections and removed sections we currently dont support
Re-added top id for scroll to top feature.
Merge branch 'master' into integ-test-fixes
Merge pull request #180 from guardian/integ-test-fixes

Integ test fixes
removing unused font stuff
compress folder minecraft.jar into file minecraft.jar
Merge branch 'index-autocmd' into guns
add -source in pom
基本上通过了，需要反复测试
VirtualProgram: alter so it doesn't share the osg::StateAttribute::PROGRAM type enum with osg::Program. This will bypass pre-compilation in a GLObjectsVisitor or in the IncrementalCompileOperation; besides, it's the right thing to do.
VirtualProgram: remove inheritance from osg::Program; not required.
Merge branch 'master' of github.com:gwaldron/osgearth
Merge branch 'release/0.1' into develop
started release creation
upstream the release no matter what. otherwise what's the point?
planning and a wishful summary for stage
ready to test release start
added plan to support abandoning releases
some nicer formatting
capitalizing, and enforcing the one-release-branch-at-a-time check.
added properties to lessen likelihood of accidentally adding dependencies on hard names
added another option to release publish
origin and canon properties
using properties instead of _cr
Release publish should work. Testing time!
dumb handling of forked vs non forked publish. resolves issue #5
dumb handling of forked vs non forked publish. resolves issue #5
merge conflicts suck
Merge pull request #6 from haaksmash/feature/releases

Feature/releases
forgot publish command last time
bumping version
adding reminder to bump release version
Send the correct element for fragmenthidden events
Merge pull request #72 from rhudea/fix-fragmenthidden

Send the correct element for fragmenthidden events
P2P: Do not request blocks from peers with fewer blocks than us

If the remote node has a shorter chain, do not waste our
special getblocks request on them.
Send 'mempool' P2P command at the start of each P2P session
to query remote node mempool contents.
Avoid crashes at shutdown due to printf() in global destructors.
change Q_WS_MAC -> Q_OS_MAC (Qt5 compatibility)

- I missed that one in my former pull
Handle incompatible BDB environments

Before, opening a -datadir that was created with a new
version of Berkeley DB would result in an un-caught DB_RUNRECOVERY
exception.

After these changes, the error is caught and the user is told
that there is a problem and is told how to try to recover from
it.
Merge branch 'BDB_DOWNGRADE'
Handle incompatible BDB environments

Before, opening a -datadir that was created with a new
version of Berkeley DB would result in an un-caught DB_RUNRECOVERY
exception.

After these changes, the error is caught and the user is told
that there is a problem and is told how to try to recover from
it.
Handle corrupt wallets gracefully.

Corrupt wallets used to cause a DB_RUNRECOVERY uncaught exception and a
crash. This commit does three things:

1) Runs a BDB verify early in the startup process, and if there is a
low-level problem with the database:
  + Moves the bad wallet.dat to wallet.timestamp.bak
  + Runs a 'salvage' operation to get key/value pairs, and
    writes them to a new wallet.dat
  + Continues with startup.

2) Much more tolerant of serialization errors. All errors in deserialization
are reported by tolerated EXCEPT for errors related to reading keypairs
or master key records-- those are reported and then shut down, so the user
can get help (or recover from a backup).

3) Adds a new -salvagewallet option, which:
 + Moves the wallet.dat to wallet.timestamp.bak
 + extracts ONLY keypairs and master keys into a new wallet.dat
 + soft-sets -rescan, to recreate transaction history

This was tested by randomly corrupting testnet wallets using a little
python script I wrote (https://gist.github.com/3812689)
Don't try to verify a non-existent wallet.dat
Merge pull request #1833 from jgarzik/mempool-query

Send 'mempool' P2P command at the start of each P2P session
Revert "Send 'mempool' P2P command at the start of each P2P session"

Fat-fingered on github, and merged this too early.

This reverts commit 22f9b069035c9ba0416a62714db167eea5ba762f.
Merge pull request #1834 from jgarzik/kickblocks

P2P: Do not request blocks from peers with fewer blocks than us
Merge pull request #1915 from Diapolo/Qt5_compat_leftover

change Q_WS_MAC -> Q_OS_MAC (Qt5 compatibility)
Merge branch 'crash_at_exit' of github.com:gavinandresen/bitcoin-git
Merge branch 'wallet_exceptions' of github.com:gavinandresen/bitcoin-git
Fix bad merge, pszDataDir duplication
Bump versions for 0.7.1 release
0.7.1 release notes
put flicker files in the .bitcoin directory
first cut at flicker keygen
done, submitting..
done+cleanup, submitting..
add submitted pdf
hypervisor/kvm: fix drive order.
Merge branch 'fix-kvm-cdrom-drive-order'
misc/kvm-ctl.sh: add info command.
In-built JSON parser taken into use.
av => photowalk
ao/av => photowalk
mv ao/dvdutils => dvdutils
rm -r ao
report current target upon forbidden package (fixed issue #1215)

git-svn-id: http://haxe.googlecode.com/svn/trunk@5415 f16182fa-f095-11de-8f43-4547254af6c6
Merge branch 'haxe/master'
[javalib] multiple type parameters parsing error


git-svn-id: http://ocamllibs.googlecode.com/svn/trunk@244 21970f9d-2756-cbab-44b1-85fcaa48d7c2
switched SnpDetail to use OneToOne but receiving error message on generate
First prod build.
explicitly set env var for sync
Changes to colors and what not
Add basic dispatch (part running on VM)
Add test script to put 10 random jobs with proper param range
dispatch.py: Implement put for finished jobs
dispatch.py: Write back result
BUG ssbuttons.insertmedia not correctly loading the dimensions and alignment from the HTML (fixes #8049)
Remove old Bio-Formats logos

These aren't referenced anywhere in the codebase, and are superceded by
new logos stored elsewhere.
Update remaining logos to latest versions
Sorting remaining issues ex non-developer new
new file:   uml.png
Temporary commit.
Merge branch 'master' of https://github.com/hhorstia/NoppaCRA
One commit to rule them all.
Removes unused imports and removed the use of popups
Fixed error with creating library from strings. Made selecting noded in tree only get one song.
Default to production push gateway.
Remove noisy comments
Teach Grocer about its current environment.
Default gateway to sandbox, unless in production env.
started experimenting with kana input widget.
updated to using blcok
cleaned error
Copied FilePattern/FilePatternBlock to SCIFIO

These classes are almost completely unchanged from their loci.formats
versions, thus a two-stage conversion was not necessary.
fix: moved numberfilter to scifio
fix: moved dimensionswapper to scifio
fix: added TODOs in coremetadata
fix: added setDimensionOrder to FormatTools
fix: Can now copy a coremetadata via construction
fix: added getAxes[] and getAxesLengths[] to CoreMetadata
fix: added findDimensionOrder(Axes[]) to formatTools
fix: fixed FormatTools.setdimensionorder
fix: first pass DimensionSwapper
fix:Added findDimensionList to FormatTools
fix: added setreader to ReaderWrapper
fix: first sort of implementation of FileStitcher
fix: SCIFIOReaderAdapter includes missing methods
fix: added isFormat(string) to checker
fix: set coremetadata.source field when creating it.

just a band-aid. .need to implement actual RAIS naming scheme
fix: SCIFIOreaderadapter now returns proper series index
fix: getZCT coords in scifio now takes imageIndex
fix: removed hardcoded imglib versioning
fix: removed Metadata instantiation from scifioformatwriter.setmetadata
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

pull from upstream
found bug in users sync details, should return an object not a string. if we just return straight we have recursion, if parsing stringifed we can work aroudn the recursion.
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB
re deleting the dev page
fixes #593 deployed version 1.21.3
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

pulled from upstream
moved the progress bar to before we contact the server, so that they konw at least it's thinking.. and resized the welcome modal so that it looks better fixes #596
fixes #483 put the import for csv back to the way it was. sample data imports again
turning debugging on
fixing the welcome screen's login error box, it wasnt showing the errors the server was returning. fixes #598
adding more communication to the user when the app is unable to log them into their corpus which was a side effect of #599
rough draft of the users's dashboard where they can choose between their corpora. fixes #477
user's dashboard is able to look up a users corpus in the pouch and redirect the user to the corpus dasboard. the new flow of index -> user -> corpus is in and is working for basic cases. (creation of new user, and page load after a known dashboard, and page load of an uknown dashboard with a known pouch fixes #600
check-in of https://github.com/paulrouget/dzslides commit b4a591b1464e151c978a2b1787d04500679f064f to be used for presentation fixes #601 @trisapeace
pointing the tests manifest to the slides to make it easier to edit them. now can load the FieldDB folder as an unpacked extension and it will take you to our current slides for #601
initial comit
@trisapeace here's the intro slides, so you can wave yours in i will now start on the require js stuff
Added a questions slide.
Changed CSS to make h2 smaller than h1.

Also made the title of the HTML page the same as the title of the
presentation.
slides for require are in, now just have to fill in the gists with the code.
Fix 32-bit build


git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12077 3db68df2-c116-0410-a063-a993310a9797
Fixes inconsistent bow props on some Persian units, based on patch by dvangennip. Fixes #1523

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12078 3db68df2-c116-0410-a063-a993310a9797
- Fig Tree: Gave it the "berry bush" selection sound to help drive home that it is a fruit-bearing tree.
- All Mauryan buildings: Removed the Persian structural health bonus, a legacy from copying over from Persian templates.
- Mauryan Barracks: Added the Indian Light Cavalry to the training roster. Removed the Persian Barracks portrait icon.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12079 3db68df2-c116-0410-a063-a993310a9797
Tweaked Mauryan sandbox.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12080 3db68df2-c116-0410-a063-a993310a9797
Merge remote-tracking branch 'remotes/trunk'
Gates. Adds UI buttons, replaces wall section with a gate, defines and create obstruction shapes, detects friendly units and eventually disable door's "block movement" flag, allows us to lock / unlock the door by disabling "block pathfinding" flag. Needs icons, play sound, animations. Fixes #1385, refs #619.


git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12081 3db68df2-c116-0410-a063-a993310a9797
Merge remote-tracking branch 'remotes/trunk'
Automated build.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12082 3db68df2-c116-0410-a063-a993310a9797
Fix phases.


git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12083 3db68df2-c116-0410-a063-a993310a9797
Fixes waypoint flags for Britons and Gauls.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12084 3db68df2-c116-0410-a063-a993310a9797
Britons emblem.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12085 3db68df2-c116-0410-a063-a993310a9797
Merge remote-tracking branch 'remotes/trunk'
Ignore changes to ActorEditor.exe
Merge remote-tracking branch 'remotes/trunk'
Removing ActorEditor.exe
Britons get the Kennl.
Gauls get the Rotary Mill.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12086 3db68df2-c116-0410-a063-a993310a9797
Updates to a few sounds

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12087 3db68df2-c116-0410-a063-a993310a9797
Skeletal setup for animated opening and closing gates

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12089 3db68df2-c116-0410-a063-a993310a9797
Palisade gate opening and closing animations

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12090 3db68df2-c116-0410-a063-a993310a9797
Fixed "specific name" for palisades, since they were taking "stone wall" from the defense_wall template.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@12091 3db68df2-c116-0410-a063-a993310a9797
Removed dependency on MediaItemComparator
Cleaned up
Moved and renamed MediaItemComparator to movie extension where it belongs
Removed unused method.
Removed unused code.
some unit test fixed.
APIClass unit test fixed.
+) fixtures
Make the toto default file extension md

So we remember that we're using markdown, not just plain txt files.
added cron job, fixed getMyDeals
Merge branch 'master' of https://github.com/holmesal/levr_app
core: Fix not updating storage when mode changes

With mgmt interface bluetoothd is no longer requesting mode change for
things like DiscoverableTimeout as the kernel will do that automatically
when the timer expires.
Update history for new version.
Add google analytics tracking.
Add licence.
Added basic language construction logic
[enh] replaced deprecated popen2 with subprocess
[enh] replaced manual index with enumerate
[enh] use path.join and string formatting instead of concatenation
[enh] simplified return statement
[enh] removed unused MP3 sample rate extraction
[enh] simplified filename check
[enh] removed unused/redundant imports
[enh] removed unused track length variables
[enh] removed unused status variables
[enh] replace os.system with subprocess.call in Burner.BlankCD
modify customer invoice controller
Revenue sync with outlet added
Merge branch 'master' of https://github.com/hunar15/13-server
DB UPDATED
finished requests, get outlet
Added options to zsh config
BUG-FIX: the independent install_hyperspy_here script was raising an error
Let set custom headers and timeout interval
Finished welcoming and goodbye'ing of players when the enter/leave a
town. Plus tones of misc. changes and features.
Massive stage changes for v3
Corrected stray namespace mistake in RP config file
Corrected stray namespace mistake in RP config file
Update complete sortlist
Remove title
cleanup and add highlighted error maybes when not using 3x3
and logic for Lucene
Add a full title helper
Add routes
Tidy up tests
Fill in layout
Use Stream.Null for File.open('nul').
Added support for PostgreSQL databases and updated home action
Removed language definition from travis build file
Another wrong include path.
Version ready to build and use
compare products complete
Improved highlighted code caching and performance
- Pygments caching is broken into a couple utility functions for greater flexibility.
- Now Gist cache files are hashed against their gist id and parameters.
- Raw gists are no longer cached, only processed gists.
- Gist caches are still stored in .gist-cache/ for more atomic cleanup.

Note: For the docs, caching speeds up generation by about 1800 milliseconds on my machine.
Added placeholder template.
Make good on promise in README.
saving temp files to ramdisk on macbook air
added sass mode
improved clojurescript setup
added custom seni development keyboard shortcut
Lade till funktion för att kolla stor/liten bokstav på pronomen som skall ersättas
Add counters for IPv4 in IPv6 and IPv6 in IPv6
Make sure we never underflow len in DetectLoadSigFile
added some todos, added some failing tests for checking an interval is \in\ another interval and tidied up the interval_set module a bit
Add condition to start block
move camera ip adresses to hardware config
Merge branch 'master' of github.com:ipa320/cob_robots
implemented start invitation, accept key cannot be equal to decline key

Signed-off-by: Justin <justin@lenovo2.manila.orangeandbronze.com>
revert change, because work is done in repo-nexus-client
suppress errors
Add rounded corners to click effect
Give rounded corners to the flag as well
Merge branch 'master' of github.com:isitchristmas/web
unit tests for login + json field for contact in user + user creation_date
send_chatmsg renamed send_msg
send_msg differentiates chat msgs (that get printed) from debug messages (that won't)
added work around to reaadme.md, remove unneeded packages

added work around to reaadme.md, remove unneeded packages
add fsmap
Added functionality to reset top list but keep times. Text on races changed.
added phpenv-install file for use as a phpenv plugin
updated README to include instructions for using php-build as a phpenv plugin
updated README
Merge git://github.com/humanshell/php-build into feature/phpenv-install
Merge branch 'feature/phpenv-install'
Added 5.4.1, 5.3.11 final definitions.
Added back hack for OSX, which removes '.dSYM' from built executables.
Better Log message, removed some tabs used as indent.
added check for the .dSYM files before trying to remove them
Merge pull request #54 from eriksencosta/squeeze-issue

added check for the .dSYM files before trying to remove them
Merge remote-tracking branch 'origin/master'
Release v0.6.0
Starting v0.7.0 dev
Merge remote branch 'upstream/master'
Remove executable bit from 5.3.11 and 5.4.1 definitions.
Made some basic core stuff
test
rm test file
Merge branch 'master' into anton-dev
fix saving on windows
win fix
Merge branch 'aaron-dev' into anton-dev
Merge branch 'anton-dev' into aaron-dev
Add jump to anchor on page
+ media dir fix, gallery render position fix, gigaserver .htaccess fix
editable and cursor
another:
another:
Changed some design and began using mongoose instead of mongolian
[Users]: more flexible template for profile action
Make particles easier to extend
Rolling back fragment support commit.

Requires an extra jar and affects every project that's built with
Rajawali. Need to look at alternative solutions.
Add equals() method to Number3D
Lots of bug fixes #114 #120

Fixes a lot of issues that occurred when rebuilding the scene after the
OpenGL context was lost.
Merge pull request #156 from jayschwa/number3d-equals

Add equals() method to Number3D
Merge pull request #151 from jayschwa/extensible-particles

Make particles easier to extend
Concurrency fixes
add method compare  memory MapBenchMark, included in tests
removed needless method
and another….
and more…
moving the vimrc to its proper location
Taglist auto update
README.md less ugly.
Make separate view controllers for each practice
Adding zencoding finally
Marked MongoModel for skipping if Mongo extension is unavailable
Increment version number.
Merge branch 'hotfix/0.0016'
inicial Ale
inicial
completion work
fix bugs and improve default script
Only do slow integration tests if we have the correct env vars
Merge pull request #5 from mhart/fix-tests-for-pull-requests

Only do slow integration tests if we have the correct env vars
[maven-release-plugin] prepare release jenkins-1.486
[maven-release-plugin] prepare for next development iteration
updated changelog for release
updated changelog as a part of the release
creating an RC branch
the trunk is toward 1.497-SNAPSHOT
adding the CHANT font for use with PUA characters
Added basic HUD, game over message
Merge branch 'master' of https://github.com/jfred1979/badball
After every user is created a cart is created
Fixed create_cart method
User has one cart, fixed create cart funciton accordingly
Changed create action so the current user's task is used to create the new cart item
change mod in readme to modification
cleaning up sounds
cleaning up sounds
fixing meter tests
update login
Merge conflict
Merge branch 'master' of github.com:jiangmingxia/java
Fixing untracked content.
绑定a-f为ctrlp
index project page fixed up
users: added full_name field
read tracking now
Merge branch 'master' of https://github.com/jin-young/RepCRec
read/write lock acquiring
Prvni krucky
Uspesny scenar
Uspesny scenar
distel
          (define-key erlang-dired-mode-map (kbd "C-z s") 'erlang-compile-cur-buffer) ;compile
          (define-key erlang-dired-mode-map (kbd "C-z s") 'erlang-compile-cur-buffer) ;compile
Merge branch 'master' of github.com:jixiuf/emacs_conf
rework .compact() and .reject()
simplified reject()
added .push()
added .each(string)
event handling NOW works
Remove TryParseHelper

These helpers were removed because they only needed to exist for compact framework support.  Given the compact framework is not a supported platform for SharperGps they were removed.

	modified:   Demo_WinForms/SharperGps_Demo_WinForms.csproj
	modified:   SharperGPS/GPSHandler.cs
	modified:   SharperGPS/NMEA/GPGGA.cs
	modified:   SharperGPS/NMEA/GPGSA.cs
	modified:   SharperGPS/NMEA/GPGSV.cs
	modified:   SharperGPS/NMEA/GPRMC.cs
	modified:   SharperGPS/NMEA/PGRME.cs
	modified:   SharperGPS/NTRIP/SourceTable.cs
	modified:   SharperGps.sln
added gw
Added query wrapper function for custom queries
Added session starting to main framework file.
prevent multiple loads of class defs.
Added bulk load functionality
Added runEvent to the event object
added preEvent handler to event object
added per app settings example in config
named cache incorrect
Version bump to 0.1.0
Changed tests to RSpec
Insert port into URL to visit if it doesn't have one already and Capybara.insert_port_into_portless_url is true.
Check for default port instead of hardcoded 80.
Add test for Capybara.insert_port_into_portless_url.
Merge branch 'master' of git://github.com/jnicklas/capybara into insert-port-into-url
Rename option insert_port_into_portless_url to always_include_port and clear up description.
Refactor tests for always_include_port option.
Merge pull request #698 from DouweM/insert-port-into-url

Add option to automatically insert port into URL to visit when it doesn't have one already.
Add fallback to hard-coded package names if trying to infer from the classloader fails.
Remove old constantine definitions, and defer to the new jnr.constants versions
Deprecate the old com.kenai.constantine namespace
removing useless folder of dummy app
add public_suffix dependency to Gemfile
Clean up the Camera's event system a little.
help from dad
Added database (SQLite) support.

Now we store the categories in database. Also we can delete personal
categories.

TODO: There is a redunt category state variable. Clean up!
only listening for events that we can actually handle.
add block.py, send_aa.py
block, send_aa now work with model on very large messages
show block on receive also
remove gdb noise about linux-vdso
merge 3.2
- Issue #11715: Fix multiarch detection without having Debian development
  tools (dpkg-dev) installed.
null merge
#15980: properly escape newlines in docstrings.  Patch by Serhiy Storchaka.
#15980: merge with 3.2.
#15304: fix wrong warning message in test.support.temp_cwd().
#15304: merge with 3.2.
#15421: fix an OverflowError in Calendar.itermonthdates() after datetime.MAXYEAR.  Patch by C?dric Krier.
 #15421: merge with 3.2.
Add What's New entries for some minor work I did in 3.3.
Mention that "defaults" can be None for inspect.getfullargspec.
Also minor formatting cleanups.
Cleanup/rewrite shutil docs regarding follow_symlinks and copying attributes.
updating gems, adding node, rvmrc with 1.9.3
sass > less
app not crashing anymore, switching assets to sass
caffeinated
heroku gemmage
remote mpd
thin..
rmpd needs to be available in prod
wip
doh, fix bootstrap
back to normal (and heroku working)
gem updates
remove old stylesheets
add logging for number of processors
Install shell script.
Install shell script.
Fix up phpunit.xml.dist for old system tests.
Update README for address validation
Adds Solaris Zookeeper patches
some sytling
Merge branch 'develop' of github.com:joshdk/jambusters into develop
new CSS for presentation
Merge branch 'develop' of github.com:joshdk/jambusters into develop
Grr caching
Added new file
changedsmth
test
+ gupnp-vala-0.10.5.
Don't expose sys/resourcevar.h to userland if OPSYS = NetBSD.
Regenerated after updating to latest release and adding patch.
Updated to latest release.
Sample config file.
Empty placeholder file.
Added EGDIR CONF_FILE.
Gave each SED command its own grouping. Fixed CONF_FILES, INSTALLATION_DIRS
Added EGDIR and post-install stage; Moved other stages lower in file.
+NO_BUILD=yes
Import py27-chealpy-0.1 as wip/py-chealpy.

Python Binding of chealpix
Import py27-forthon-0.8.10 as wip/py-forthon.

Forthon provides an extensive wrapping of Fortran95 code, giving access to
routines and to any data in Fortran modules. Forthon also
provides an extensive wrapping of Fortran derived types, giving access to
derived type members, allowing passing of derived types into Fortran routines,
and creation of instances at the Python level. A mechanism for automatic
building of extension modules is also included. Versions using Numeric and
Numpy are available
Import py27-qutip-2.1.0 as wip/py-qutip.

QuTiP is open-source software for simulating the dynamics of
open quantum systems.  The QuTiP library depends on the
excellent Numpy and Scipy numerical packages. In addition,
graphical output is provided by Matplotlib.  QuTiP aims
to provide user-friendly and efficient numerical simulations
of a wide variety of Hamiltonian's, including those with
arbitrary time-dependence, commonly found in a wide range of
physics applications. QuTiP is freely available for use and/or
modification on all Unix based platforms. Being free of any
licensing fees, QuTiP is ideal for exploring quantum mechanic
and dynamics in the classroom
Import php53-ffmpeg-0.6.0 as wip/php-ffmpeg.

ffmpeg-php is a PHP extension that adds functions for accessing and
retrieving information from movies and audio files. ffmpeg-php provides
access to the many audio and video formats supported by ffmpeg.
Merge branch 'master' into joyent
Integration of Google Map Using gmaps4rails
emailer config

hopefully this time it will work
Fix duplicates test
Alterações em exceptions
Updated EncoderFilter to handle the UuEncode ContentEncoding.
Improved docs for EncoderFilter and DecoderFilter.
Vim Powerline
Merge branch 'master' of github.com:jstraw/cloudshell
Fix auth bug on dns shell from auth updates
#POULPE-481 Moving towards configuring the app via tomcat jndi resources
#POULPE-333 minor changes to provide "forward" param in the code.
Merge branch 'master' of jtalks.org:poulpe
#POULPE-336 EditGroupsForBranchPermission window should looks fine
Checkin release notes
Update dialog plug-ins

Latest versions compile without warnings.
Updated IRC channel name in README.

Only one octothorpe now.
Save all xibs with Xcode 4.4.1 (4F1003)
Change deployment target of all xibs to OS X 10.7
Fix xib warnings
Helper function for getting CFError description
Use Security framework instead of deprecated OpenSSL functions
Stop using deprecated NSSavePanel/NSOpenPanel methods
QLPreviewPanel is no longer private
Use SecItemCopyMatching instead of the deprecated SecKeychainSearch
work inside of submodules
add offer flow
Fix issues found by IDE's inspector tool
Add and fix documentation for EnumConverter
Add more documentation
SmartObject Class and README updated
Generate class constants (e.g. "String.class") in the same way as literals.
remove old .gitmodules
Making sure that public headers get copied into include/MBProgressHUD.
New integration instructions and some readme cleanup. 
Some additional readme tweaks. 
Merge branch 'master' of github.com:matej/MBProgressHUD
Added color support to MBRoundProgressView. 
Merge branch 'master' of git://github.com/jdg/MBProgressHUD
week 2 of book club
Merge branch 'tp/sven_marc_fix_2' into ibm_next_tmp
Merge branch 'tp/marc_fix_sync' into ibm_next_tmp
Merge branch 'tp/jim_next_gr60' into ibm_next_tmp
Merge branch 'tp/ibm_next_mattFix' into ibm_next_tmp
better example in readme; consts in one block
Removed bubbleBabble
Removed duplicate HMAC check that has been useless since the introduction if sequence numbers in the protocol spec

(Duplicate HMAC check will be removed from spec in next minor revision.)
Refactored locales for courses
Refactored locales for course_groups
wmnetmon agregados. Agregar themes desde http://delicious.com/redirect?url=http%3A//www.tenr.de/styles/allstyles.php
design1 added
Initial work on a TorqueBox template.
[torquebox] Bumped to TorqueBox 2.0.3 from 2.0.2.
[torquebox] Do rolling deploys with TorqueBox so the site doesn't go down when deploying.
Changed nginx.conf to only include the tools.conf on an instance that
has the web_tools role. See the following thread where this change was
discussed:

http://groups.google.com/group/rubber-ec2/browse_thread/thread/eec1856d5fd93eea/6d1ff6a3304d65bc?lnk=gst&q=role_names+web_tools#6d1ff6a3304d65bc
Changed passenger_nginx role dependencies so that web_tools can be run
on a separate instance.
Restore fstab.bak if EBS times out
use dash instead of another subdomain level for web tool proxy hosts to prevent ssl complaints with wildcard certs
Fix typo causing Ubuntu 11+ to time out waiting for incorrect volume id
be more strict in selecting role directory during bootstrap
Merge pull request #168 from akremer/fstab_fix

Critical: Fix EBS Volume Mounting Issues
Merge pull request #154 from wr0ngway/add_torquebox

Add torquebox
Merge pull request #165 from rwc9u/web_tools_nginx

Changed nginx.conf to only include tools.conf for instances with the role 'web_tools' 
Merge pull request #166 from rwc9u/web_tools_nginx_multi_instance

Support to run web_tools with nginx on a separate instance
force older version of net-ssh till issues get resolved
bump version
updated changelog
sun-java6 fails on Ubuntu 10.04
Merge pull request #171 from ScotterC/patch-1

sun-java6 fails on Ubuntu 10.04
Made SavedGame::save() exception proof.

It will no longer leak memory when an exception occurs.
Changed SavedGame::isResearched() for vector.

Instead of copying and removing research items, simply track the count of
undiscovered research. It's still O(N*M) but it's cleaner code.
Fixed memory leak in Game::loadLanguage().

We are now properly destroying the sidebar surface.
Fixed display of recovery time.

The code would never display a recovery time of a single day. Fixed.
using functions to check if the URL needs a queryString
specs improved to test prepend CSS dependencies
refactoring generation of new processor objects