labofsahil/github-event-dataset-2012 huggingface dataset:
Space/Tab cleanup script - run before committing

Running this script will transform tabs into a pair of spaces and will
eliminate trailing spaces. Use at your own risk!
make PresentationCompilerThread a daemon
Small simplification of commit 87c9fc0df0f0e74d3a07f95634356d6425877091.
eqTypeCode(Number) is equivalent to typeCode(Number).
CHAR code is impossible because java.lang.Character is not subclass of java.lang.Number.
More Symbols and Flags.

Another "three yards and a cloud of dust" in my ongoing
battle against flag uncertainty.
Merge commit 'refs/pull/361/head'; commit 'refs/pull/362/head' into develop
SI-4540 Fix [RichDouble|RichFloat|RichLong].isValid[Byte|Short|Char|Int].

This commit fixes test cases mentioned in comment 03/Apr/12 to SI-4540.
Methods are fixed in leaf classes RichDouble|RichFloat|RichLong.
Their superclasses are not modified.

File is-valid-num.scala contains commented tests of
isValidLong|isValidFloat|isValidLong,
but they are not added anywhere now.
Bumped the number of samples of the memory leaks test to 50. This should make it much more resilient against spikes. Also removed usedmem file dumps.
Make specialize check cheaper and consistent.

Profiler said checking hasAnnotation thousands of times
is expensive.  I always wondered why some things used the
SPECIALIZED flag and others looked for the annotation.
No reason emerges which is apparent from the tests.  So:

 - mark an annotated symbol specialized at a convenient time
 - always look for the flag
 - create Symbol#isSpecialized to be consistent with all others
Merge commit 'refs/pull/364/head' into develop
Less laborious type application.

And eliminating redundancy.  Reduced gratuitous usage of typeConstructor
on symbols which don't have type parameters.
Cleaning up some repl mechanisms.
fix field init problem in NoStackTrace
SI-5571: adds @volatile to field Enumeration.vsetDefined
Fix for SI-5648.

More care in warning about bad comparisons.
Merge commit 'refs/pull/365/head'; commit 'refs/pull/366/head' into develop
Fix memory leak related to default arguments in presentation compiler.

This bug exists for a long time, but was triggered / discovered only lately
by the default argument of mkParams in 118aef558f.

This reverts the workaroud commit 19b6ad5ee4.

The fix is tested by test/files/presentation/memory-leaks which runs the
presentation compiler several times on Typers.scala. I could not reproduce
the memory leak in a smaller test case.
fix for get-scala-commit-* on Windows (tested with Windows 7)
This change enables the alphanumeric method to be called from SecureRandom
changed applyDynamic explanation in trait Dynamic
Implementation of SIP 18. We still need to get rid of the warnings caused by it. Before we do that, I'd like to check in the SIP 13 implementation.
update the set test to use cas properly

Change-Id: I521cecd92fbfc79463dd0549f84cd884e9c67246
Reviewed-on: http://review.couchbase.org/21536
Reviewed-by: Chris Anderson <jchris@couchbase.com>
Tested-by: Chris Anderson <jchris@couchbase.com>
MCBoard update
Cache Yelp data.
Merge branch 'master' of https://github.com/cperler/PDS-Project
Renamed build options to include version number.
Renamed ParaView generator directory to ParaView3.
Moved ParaView 3 plugin-specific commands to lower-level CMakeLists.txt file.
Fixed syntax error in Sublime config, removed Package Control settings file
ensure events sort by starttime properly in display. update todo
update for 2012/07/25
naire page design
Update week 3 app
added code to load contact list panel
modified code to load inner panels
Allow node >= 0.6
Bump version to 2.0.1
modified package slightly
Updated Users
user database update
Finished the password machinery
Added Factory girl to gemfile
Added User factories and test for show page
Added gravatar gem
Added a side bar with some styling
Added submission txt
fixed a small random bug
Update database deploy script
Updated code & readme
Fixed 1970 date problem.
project name rename test => deploy
Vertaald naar Nederlands (frontend)
Getting server to take new interface into constructor.
First server test.
Setup for more ServerTests.
Use *args and **kwargs in profile entry method
Updated create_wrapper to call the new commands for HyPhy: HYPHY_LIB_DIRECTORY and inputRedirect.
Created the new module BatchFile.pm and modified Base.pm to work with it. Also therefore modified the other modules to take in a more generic batch file name.
deployment
初回時にスキーマ作るやつ消した
Added hayden assets.
updating for node 0.8 and changing params for fhc local
Arch: Small improvement to structure
Actually makes the request now
Fix README (last minute change for 0.41)
a variant of fresh() making for more readable code
Dodano narzedzie do drukowania tablic w bazie danych
Dodano poprawki do tutoriala bazodanowego

Signed-off-by: unknown <dadr@.MobicaPL.local>
Start moving toward a universal app
missed a file
Add generated Xcode design files
work on IB usage
Fix: Fixed memory issues in Scene Graph RegisterNode/UnregisterNode mechanism.
Removed warnings from KeyedArchive.
Merge branch 'development' of github.com:dava/dava.framework into development
Fix: added opensl and entity system to android make files
[DF-185] Added Descriptors for PVRTest textures
[DF-185] Remove unused data files at UnitTests
[DF-312] Added ImageLoader class to load textures with images.
[DF-312] Removed TexturePVR.cpp file
[DF-312] Refactored reading of PVR files
DF-273 fix: mac compilation fix
Merge branch 'development' of github.com:dava/dava.framework into development
[DF-448] Added split/merge tile mask & channels
Almost stable mysql adapter and database connector
Updated Eclipse configs
DexInstruction.getOriginalInstruction -> getOriginalAssembly
CFG classes renamed
LiveVarAnalysis moved (didn't need its own package)
add image_url to card responses
Pin BeautifulSoup to < v4

Imports are different for version 4 so use earlier than this for now.
Ajout d'un benchmark
fix prettyprint in jax-rs
Version 1.0.4
- added control to disable deleting last row or last column in the
table
- added minimized version redips-table-min.js
nearly back to have it all working but with in memory addition of sorting composite index type rows now
Changed a sign
Added new commands. Along with warp.properties
Added beginnings of date range support
Refactored timeline query into contentProvider
preparing to reupload open layers
moving open layers
for real this time added new openlayers js
fixed a merge conflict
Change Readme.txt from ShiftJIS to UTF-8.
appcache url

1. url to W3C HTMLoffline spec
Storing VirtualCollections, starting view page
Migration query to add users to organizations
Displaying record count of virtual collections
Persisting the query
VirtualCollection abstraction

Introduce VirtualCollections and a Collection abstraction, used by the OAI-PMH Service.
Parse all namespaces contained in a RecordDefinition and using them to output valid OAI-PMH results with namespace declarations.
Initial spec for OAI-PMH
Fixes in language resolution
Property style
Production smtp type is not mock
Starting the UI for VirtualCollections
Preview of search results for virtual collections
Storing VirtualCollections, starting view page
Migration query to add users to organizations
Displaying record count of virtual collections
Persisting the query
Fixing a check
virtual collections ui update
Preparing accessKey implementation
Implementing AccessKey checks. Fixes in OAI-PMH ListRecord and GetRecord.
DataSet filtering
Simplifying query composition, excluded identifiers
Refactoring: moving all record accessing methods to MetadataRecord, simplifying, cleaning up
Merge pull request #435 from delving/virtual-collections

Virtual collections take one, OAI-PMH AccessKey, Cleanup
first erlang testing with karsten
Comment out pickle command.

It was over-writing the matlab output so that I could not open the
output file in output.

A planned feature must be to select between pickle and matlab output.
Add commented out line ready for pickle options.
Reimplemented this in terms of existing ZSH functionality.  Also made the string limiter snip the string in the middle instead of the beginning.  In truth, the beginning and end of the directory tend to be more important than the beginning
run ntpdate after wake-up
cut currency choices
show product stock on category page
Added support for vimclojure repl
Added support for clojure maps
Update sipxpbx/WEB-INF/paging/PagingGroupsPage.properties
Update src/client/i18n/ar.ts

Can i start translating to Spanish?
Add Chap8 ex of Data munging with Perl
adds a data action to the asta controller
Merge branch 'develop' of github.com:dirkschumacher/iUPB into develop
adds a responsive layout for the bus view
started implementing a jsonp asta controller/view
adds more translations for the bus view
adds missing space in bus view
fixes a bug when no bus data is available for a station
Merge branch 'develop' of github.com:dirkschumacher/iUPB into develop
makes minor changes on the translations for the bus view
adds some more love to the application
makes a proper class for love :)
fixes bug https://www.pivotaltracker.com/story/show/30238857
adds more has tags to twitter and rel=nofollow to links inside tweets
removes ssl for api calls as long as we do not support ssl
implements https://www.pivotaltracker.com/story/show/30185069
refactors the transportation js code.
fixes auto reloading for the bus view
removes the "!" from the footer
adds a quick solution to https://www.pivotaltracker.com/story/show/30255035
adds a partially working site map
w3m integrated to be used with pylookup
C++ 11 standards

now utilizing stoi in C++ 11 standard and used a more abstract makefile.
fix_descr
killed old castle-kit version
Add section 3 to vignette.  Change "Marker" column name to something more sensible.
partially through modelling users
Elaboration part2 in progress.
Replaced in all active scripts from EXTWEAKS to STWEAKS. extweaks not supported!
Finished the zram description.
Removed GOVS that now OFF in kernel
Removed Luzactive from cortex! users have app to control it, let them.
Added small mark on each ROM branch init.rc! to see if ROM is detected as should!
if some rom get wrong INIT, it's can be very BAD!
we need to find such problem, and fix it with users help!
also added that check to global debug script.
Add support for "%s" in bundle name (replaced by hash)

This patch looks for '%s' in a named bundle and replaces it by the
bundles' hash.

This allows to have named bundles, whose path/url changes if the its
content changes.

You might want to refactor this into a getNameForType method (handling
both null values for $name and %s in a regular name).
Merge pull request #4 from blueyed/master

Add support for "%s" in bundle name (replaced by hash)
Initial check in.
Refactored to remove direct Spring Data dependency in the endpoint code.
Updated version.
1. Limits became D/R
Updated help file, corrected wrong github url
Add TestExtensionManager

Create a special extension manager class that uses pre-configured
extension instances instead of loading them from a plugin set.
This makes setting up controlled environments for testing much
easier.

Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
initial build of spout plugin
finished... except there is no way atm to set a group,
waiting for the enhancement.
levels organized
Slider snapping worked out
Add the command-not-found plugin
rpm spec file: Bump stb-tester version to 0.7
Makefile: Always generate version number from the *stb-tester* repo

I have a Jenkins server set up that builds an stb-tester RPM for me. The
configuration for that Jenkins job lives in its own git repo. The
Jenkins job was untarring the stb-tester tarball (with its VERSION file)
inside a checkout of the jenkins-rpm-job repo, so when the stb-tester
Makefile tried to determine the version from the git tags, it was
looking at the history for the jenkins-rpm-job repo instead of the
history for the stb-tester repo.

This change causes the "git describe" to fail in the scenario just
mentioned, so the stb-tester Makefile picks up the version number
from the VERSION file (shipped with the tarball) as intended.
Added three new classes which should make it extremely easy to choose and read audio files on iOS devices.
fixed build on non-mac os x
improved smtp sample
Merge remote-tracking branch 'upstream/master'
set more default args
playing around with ajax in rails

Signed-off-by: Andre Dublin <81dublin@gmail.com>
removed surganove from main playlist
added more starred songs on Spotify on August
two more songs to main playlist from spotify and more styling
added a few documentaries that look interesting
fixed unicorn restart
atualizacao com upload de foto
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/View/Contas/alterfoto.ctp
	app/View/Contas/dados.ctp
	app/View/Contas/senha.ctp
	app/View/Redes/detalhe_evento.ctp
	app/bancodedados/11dez.sql
	app/webroot/files/JQuery File Upload Manual.pdf
	app/webroot/files/License.txt
	app/webroot/files/cancel.png
	app/webroot/files/fileupload.css
	app/webroot/files/jquery-1.3.2.min.js
	app/webroot/files/jquery.fileupload (Source).js
	app/webroot/files/jquery.fileupload.js
	app/webroot/files/upload.php
	app/webroot/files/upload.php~
	app/webroot/files/uploader.fla
	app/webroot/files/uploader.swf
	app/webroot/img/eventos/developer.jpeg
	app/webroot/img/eventos/eu.jpg
	app/webroot/img/eventos/margarete_blumenau
	app/webroot/js/jquery.fileupload.js
#903 Enhanced error messages for report generation

SurveyReport.py: added missing import genObjectId

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@18997 a0171fae-0946-0410-966d-b1775066cd26
#856 Released 1.2.20, new version 1.2.21

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@18998 a0171fae-0946-0410-966d-b1775066cd26
Fix title and URL on current position
Added environment variables for testing Perforce
Update ACM_01/ACM_01.pde
Dual Projection - beta 1

* Switch between multiple live video sources.
* Swap live/recorded video sides.
* Detects if there are video files in the folders.
* Windows binary test release.
cross-subdomain cookie fix
cross-subdomain set cookie fix
bg + img - conte sua historia
arquivo cartaozinho
tweet monitor em cima do FB
arquivo
cozinha
radar change
fix for crunchies
comment about printing maps regarding underlying Clojure type.
track down error due to inability to handle lists as key's value.
more debug output
more annotation to understand unification and generation.
Added per user restriction to only play 36 plays
Released version 0.9.8
update default choice for repo type
Fixes that ugly (noob) bug which prevented EatMySoul to reconnect in case of activity
bfd/
	* elf32-arm.c (elf32_arm_size_stubs): Skip input BFDs that are
	not ARM ELF.
Added 2 helper selector functions: by name and by link. Fixed a Heisenberg bug due to PhantomJS not supporting relative URL
Updated the README.md to clarify the purpose of the CasperJS fork
moved database creation
install htop for users
Add more icons, fix star/fork buttons, fill out remaining sections.
Added capitalization support
Added better tests around punctuation
jckarter/clay@d123587 (2012-08-08 07:37:12 -0700) Tests Failed:0, Passed:300
interrupts work, blink demo now uses interrupts
Switch to Consolas font.
new test for galsim
changed prompt color (.bashrc). emacs frame size (.emacs). Local variables for correct mode (.README)
Added doxygen template
Modified toplevel compilation
Improved the error system
Trying to remove .esproj
Add sine rainbow example
Add a PSR-0 level
Add a Psr0Fixer for class / file names matching
merged branch Seldaek/psr0 (PR #88)

Commits
-------

45a56ae Add a Psr0Fixer for class / file names matching
f57888f Add a PSR-0 level

Discussion
----------

PSR-0 fixer for mistakes in class names

It fixes bad case, but for the rest it just throws an exception to notify the user, because it's impossible to fix automatically. I don't know if this is ok with the philosophy of tool or not.

---------------------------------------------------------------------------

by stof at 2012-06-20T17:44:20Z

Changing the class name is a bad idea IMO. What if the other parts of the code use the same case than the class name ? They will still trigger it with this case, and so failing on case-sensitive filesystems. the definition of the class is the place where the case could be different without breaking the autoloading.
so a PSR-0 fixer would need to analyze the whole codebase, not only a file.

---------------------------------------------------------------------------

by Seldaek at 2012-06-20T17:47:53Z

Well if they use the wrong case in other parts of the code, the code should already be failing. The point of this anyway is to highlight an error, this is pretty rare that it goes unnoticed, but it happens that it sneaks into some rarely used parts of a library.

---------------------------------------------------------------------------

by stof at 2012-06-20T17:51:58Z

@Seldaek the code would be failing only if the developer is on a case-sensitive filesystem. A common case for such errors is developign on MacOS or Windows, which are case insensitive and breaking things when deploying on Linux.

---------------------------------------------------------------------------

by Seldaek at 2012-06-20T17:54:31Z

Yeah my point is that this will show you that you have an error (I'd hope people check the diff before committing..). Instead of fixing I can also always throw an exception, so you notice it better, and you can go and fix it in other places yourself if you messed up, or rename the file if the filename is incorrect.

I can also change it to just output a warning if the exception is too violent. Up to @fabpot.
fixed README
Implement FBSD version of GetThreadPid()

FreeBSD has it's own syscall for SYS_gettid.
Implement the right calls in the appropriate ifdef checks.
pass button
bazaar panel layout improvements
adaptado layout a estrutura do sf2
added CTVIAT
webfinger profile linker
bug #439 - remove web port number from notification email "from" address
add hometown to profiles
turn "follow" into a function
cleanup
doco
zrl's when visiting public photos at the source site
prv messages: make submit translateable
DE: update to the strings
privacy settings: make submit button translateable
Support relayable_retractions that are relayed to us by the top-level post owner
Implement relaying of relayable_retractions

Also: some whitespace cleanup, fix Diaspora parent DB query
prepare to implement database update
Fix bugs in the retraction code

Currently, the following seems to be the functional status:
	For a Diaspora top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete for top-level owner
		Diaspora comments show up for non-owner
		Diaspora comments sometimes don't delete for non-owner
			-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log

		Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
		Diaspora likes show up
		Diaspora non-owner can't unlike
			-> Same as comments, seems to be Diaspora's fault

	For a Friendica top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete

		Friendica likes don't show up in Diaspora sometimes
		Friendica doesn't even message Diaspora for unlikes (sometimes?)
		Diaspora likes and unlikes work
first shot at getting like/unlike functions to work consistently
cleanup and logging
fix merge conflicts
fix failed part of merge
Move site to www host
Fixed up prototypes.
fixing CI - typo in repo name

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
Fixed big-sell left alignment
yesss
Question 1 has been started
Added a resources link
Lets make the point info window not a modal one.

If you have many of these open they track their respective point in
the charview if that point is moved. If the charview is closed then
all the point info dialogs are closed too.
Merge remote-tracking branch 'upstream/master' into workshop2012mpinonmodalv2
update to latest upstream.

Conflicts:
	fontforge/views.h
some cleaning, that nasty bloody bug in the dlist code was here again.
It would be so much simpler to have the string and dlist functions all
in upstream as a group... grrr :(
Merge remote-tracking branch 'upstream/master' into workshop2012mpinonmodalv2
Move to using the dlist that is in mainline rather than the scattered version
that was being codeveloped at the time this feature was being worked on.
Merge pull request #124 from monkeyiq/workshop2012mpinonmodalv2

v2: Lets make the point info window not a modal one.

By just waiting on the dialog instead of letting it run non modal most of the changes of this patch can be rendered useless. It's probably better to have it in the main tree and if there are issues either revert it or email me and I'll take a look!
add debug and profiling options
fix bug with leaking strncpy
Don't warn about pushing to a branch if it is the default for the remote

This avoids warning that a branch doesn't exist if it is the default branch for
the remote that is being pushed to.  Since the branch has been configured
as part of the remote, it is not likely to be a transient typo.

This is useful for workflows that involve creating push shortcuts for non-public
branches when using systems like Gerrit.
Option to not load file history on form show
Turn off showing script errors, corrected parsing url for OAuth code
Merge pull request #1097 from jbialobr/Fix1091

Fix #1091
Use HttpUtility instead of string parsing
Merge pull request #1098 from jbialobr/upstream

HttpUtility
Menu to reset selected files to selected revision.
Merge pull request #1099 from jbialobr/upstream

Menu to reset selected files to selected revision
Fix #108
Merge pull request #1101 from jbialobr/upstream

Fix #108.
Merge branch 'pr/n1093_j-a-b'
Merge branch 'pr/n1073_Nehle'
-n seconds ago fixed. Closes #1089
HandleMergeConflicts doesn't offer commit for CherryPick and ReverCommit forms if AutoCommit disabled

* Regex for spell checker fixed
Crash with wrong encoding in .gitconfig file fixed. Closes #1108
French translation: 20%
Progression 28%

FormPush, Settings, Remotes
Merge branch 'master' into frenchTranslation
Temporary delete FormViewPatch.designer.cs to capitalize its file name under Windows
Add back FormViewPatch.Designer.cs with capitalized ".Designer.cs"
GitUI.csproj capitalize file names "*.Designer.cs" to make it compile using xbuild
Minor cleanup

* TODO.txt moved to Wiki https://github.com/spdr870/gitextensions/wiki/TODO
* Removed VS2008 solution because it doesn't work with new projects
* Removed some unused files
GitCommands.VS2010.sln renamed to GitExtensions.VS2010.sln
Merge pull request #1008 from linquize/capitalize-filename

Capitalize filenames in GitUI.csproj so that xbuild compiles
Assert added to GetApplicationIcon()
Merge branch 'master' into frenchTranslation
Progression 30%

Tout ou en partie traduit: EditNetSpell, FileViewer, FormClone, FormInit, FormSettings, Open, RevisionGrid
GitExtensions Mono solution updated
Icons fixed for Mono build
Merge branch 'master' of git://github.com/spdr870/gitextensions into more_covering_tests

* 'master' of git://github.com/spdr870/gitextensions:
  Icons fixed for Mono build
  GitExtensions Mono solution updated
  Assert added to GetApplicationIcon()
  GitCommands.VS2010.sln renamed to GitExtensions.VS2010.sln
  Minor cleanup
  GitUI.csproj capitalize file names "*.Designer.cs" to make it compile using xbuild
  Add back FormViewPatch.Designer.cs with capitalized ".Designer.cs"
  Temporary delete FormViewPatch.designer.cs to capitalize its file name under Windows
Merge pull request #1009 from Teybeo/frenchTranslation

Start of French translation
Github3.csproj Add separate PostBuildEvent triggers for Windows and Linux, so Linux build works
Merge pull request #1010 from linquize/Github3-linux-postbuildevent

Github3.csproj PostBuildEvent trigger also works in Linux
Merge branch 'master' of git://github.com/spdr870/gitextensions into more_covering_tests

* 'master' of git://github.com/spdr870/gitextensions:
  Github3.csproj Add separate PostBuildEvent triggers for Windows and Linux, so Linux build works
  Progression 30%
  Progression 28%
  French translation: 20%
Users to admin menu
Actualizacion ModelCompanies
Fixed the initial game geometry.
Working.
Merge pull request #57 from frankiefu/master

update tests to show a bug in the polyfill
Fix command execution time display
Added some fake posts, fb comments
Исправление ошибок в работе
Update the section about user account hashes with two additional supported
hash functions that can be used: SHA256 and SHA512. Also document how these
are stored in the master.passwd file.


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@39015 ba62deef-0ea0-e111-9166-001e4f0fb9b1
- Merge the following from the English version:

	r38518 -> r39669	head/ja_JP.eucJP/htdocs/index.xsl


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@39672 ba62deef-0ea0-e111-9166-001e4f0fb9b1
Modern kernels are bigger than 10M

Approved by:	gabor


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@39673 ba62deef-0ea0-e111-9166-001e4f0fb9b1
Fix %SOURCE% values to point to the .xml instead of the .sgml file.


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@39674 ba62deef-0ea0-e111-9166-001e4f0fb9b1
Tweaks to output path in getting started guide.
Merge branch 'develop'
Execute scripts in conditions with formula permissions
Merge branch '1.2.x' into scripting
ask for script execution permission only once
Merge branch '1.2.x' into scripting
fix item_id table
typo in profile_selectors, fix remote tagging
added locations and i18n-fields plugin
Order was changed by the plugin
Remove plugin that is already in parent pom
Fixed snapshot qualifiers and added local deployment repository
update with custom content types
Test: added real world video lookup
Test: minor edits
loading env vars from config.cfg
working skeleton version
Add SOCKS proxy support to RTMPStream.
Sync packages.flashmedia with upstream. Fixes #34.
Add lucius and macvim colors.
Fix issues with js eventmanager. refs #2046
Fix plugin methods not being available when enabled until refresh. refs #2125
Removed endwise. Added auto-pairs.
nmerkulov_development.py was created
first step was done.
some strange with tests..
debug test
code reveiw and cleanup
add delete message interface
add LmWallService
add Ad & LmWall
add files
add pickview.
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Draw/Dice/Model/DiceItemManager/DiceItem.m
Merge remote-tracking branch 'origin/master'
update
Merge remote-tracking branch 'origin/master'
(Apparently) Fixed corruption of downloads on IE.
Messing with UML some more.
frontend fixes and mensa module added
add icon, add trend
Bump geniedb-release version
Update repos before cloudfabric install
better cross distro support
Fix super invocation
Fix distro packages assignment
cloudfabric install/remove defaults to all hosts
Add css selector in the API.ex : &style=default or & style=region
Add css selector in the API.ex : &style=default or & style=region
same apparence for dual and sviewer
OpenLayers 2.12 standard distrib to get a compressed OpenLayers.js
Using OpenLayers.getElementsByTagName for OpenLS parsing
Tested OK on FF14 Chrome23 Safari5 Konqueror4.8
Tested NOOK on IE8
see previous commit
Changing index view
Added a done count for individual categories.
FIX Revert cxf updating for problems on WS tests
REF Update ehcache
Clean up the logging enviroment before running the logging test
WCS2.0 getCapabilities fixes. Handling OWS2.0 exceptions.
Alteração para utilização de apenas uma opção do plugin
Teste de alteração das imagens no plugin
Fix the display of the stack. Before, all stack traces had for
'function' the function being called; not the function we were in. And
exception stack traces were missing the point at which the exception was
thrown.
Merge pull request #8 from msabramo/fix-stack-trace-accuracy

Fix the display of the stack.
program testowy
two our homework
Merge branch 'master' of https://github.com/gfgfggf/ourhomework
Add support for build times and basic unit classifiers.
Styling for new search bar
dif de paramRef paramVal, isReference()
Change crop resize image background to be a chess board. Visible on transparent images.
...
mend
change to the mapper.py:len(country)
Added build folder to the ignore list
Added Skeleton submodule
changed regex for HTML element from CSS gene naming
added option and set default to false for defunct browscap
added option and set default to false for defunct browscap
added option and set default to false for defunct browscap
Merge pull request #15 from ddn/master

Regex change for CSS gene naming, made browscap optional and off by default
Made it work again THANK JESUS

No idea why it stopped working, but now it's functioning again. Ignore
the last few commits. Those were there to fix this.
Added help option and helpful dialogs
Bump Version of Guava Library to 13.0.1
Merge pull request #28 from griddynamics/origin/guavabumping

Mock was fixed for test
Add a helper function to return array always
added an optional transaction around applyBatch. To disable it, override applyBatch(ArrayList<ContentProviderOperation> ops) and return super.applyBatch(ops, false);
fix bemspec
add column to users table for enable toggle
testfile ekledik
ModeComplexeOn
move bayeux4netty codebase from google code to git
[cron-git-commit] @ 00.28
install instructions. better parsing of stories. import without overwrite. filtering by assignee, status. order in tasks.py. template fixes.
fixed task translation to none.
changed the format of item and itemType field to labels, closes #78
50,000primes
kelias confgi faile neveikia
no one forges things anymore. this is the internet
PM Use proper ccflag flag in kernel power Makefile - Tdent48227
modification time
Add todo, ff and update alias.
Revert back to Express 2.x
added test for getFolder
Fri Nov 16 00:00:01 UTC 2012
changed the _setParam layer method
w/ license
client protocol server implementation
added some more operations like entryset lock and etc
more commands implemented
initial documentation
client protocol change in documentation
implemented client protocol improvements
clientprotocol: Docs for other operations
clientprotocol: doc and implementation of some more operations
clientprotocol: more and more command impl and docs
clientprotocol: added commands with impl for lock, countdownlatch and etc
clientprotocol and improvements
clientprotocol more improvements
clientprotocol: fix for read newline after binary data on server
client up on clientprotocol
changes in command
some changes
Fixed Q Commands doc
Fixed Some bugs
some more tests and fixes on client protocol
bind is no longer sent from client, it is sent from server after auth
(cherry picked from commit 12f00fba0a8354e3e1b2410852fcb345b3105129)
Added fork and peer review assignment
Merge branch 'master' of github.com:hazybluedot/ece2524
Build 32/64 Fat.
clear rails cache before test runs
explicit rendering to get rspec working with erector
Add assert methods to TestCase for operating with margins of error, as well as methods for numerical types that were missing.  Nothing surprising.
Whitespace police.
Functions for encoding and decoding hex strings now return null if given null, instead of throwing NullPointerException.
Bring a test file up to date.
My first commit
Second commit
Merge remote-tracking branch 'origin' into r19-martin

Conflicts:
	Ahoj.txt
message
had to redo the turret, seems I need to drag a new instance of the turret each time for it to do it properly

TODO
=====
* turrets should turn off physics unless they are just off screen
* turrets to shoot slower, and not that stupid laser deflecting shit
website included first cut
added artisan firing logic, need to fix artisanCount logic
artisan management screen buttons
install simple_form

convert sign up form to simple_form_for
install compass w/blueprint (semantic)
switch to susy
add breakpoint for wider screens
add customized normalize css
Update tests to proper namespace
new (json) dumps support in mongo
Unbelievable amounts of 1.8.7 compatibility!
Bump version to 0.1.0.pre.5
common: fix help command breakage

commit 199adb601ff34bdbbd0667fac80dfe0a87bffc2b "common/misc: sparse
fixes" broke the help command trying to fix the sparse error
"command.c:44:38: error: bad constant expression".

As Henrik points out, the fix was bad because the commit used
CONFIG_SYS_MAXARGS whereas the code intended to use the maximum
number of commands (not arguments to a command).

this patch fixes both by making the allocation manually on the heap.

Reported-by: Henrik Nordström <henrik@henriknordstrom.net>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Posterisation erweitert
"add_commas" option; fixed some formatting issues for right labels
fix, do not check for -std='s when the user specified one in their CC var

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
minor, import initial version of ax_zoneinfo.m4

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
minor, make checking for leapcnt files optional, use AX_ZONEINFO([right])

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
chore, check for zoneinfo files through AX_ZONEINFO in c.ac

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
minor, migrate tzraw readers to c.ac checked zoneinfo vars

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
fix, define TZDIR_RIGHT from ZONEINFO_UTC_RIGHT

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
cosmetics, update documentation for submission to autoconf-archive

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Merge branch 'bld/chn' into next

* bld/chn:
  cosmetics, update documentation for submission to autoconf-archive
  fix, define TZDIR_RIGHT from ZONEINFO_UTC_RIGHT
  minor, migrate tzraw readers to c.ac checked zoneinfo vars
  chore, check for zoneinfo files through AX_ZONEINFO in c.ac
  minor, make checking for leapcnt files optional, use AX_ZONEINFO([right])
  minor, import initial version of ax_zoneinfo.m4
  fix, do not check for -std='s when the user specified one in their CC var
fix, rename tzfile argument to probe

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
fix, actually allow tzh version 0

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
fix, define TZDIR_RIGHT only if ax_cv_zoneinfo_utc_right is non-nil

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
fix, always AC_SUBST TZDIR_RIGHT

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Merge branch 'bld/chn' into next

* bld/chn:
  fix, always AC_SUBST TZDIR_RIGHT
  fix, define TZDIR_RIGHT only if ax_cv_zoneinfo_utc_right is non-nil
  fix, actually allow tzh version 0
  fix, rename tzfile argument to probe
minor, take format.h2m from dateutils_H2M_EX list, EXTRA_DIST it and mark as BUILT_SOURCE

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Merge branch 'bld/dist' into next

* bld/dist:
  minor, take format.h2m from dateutils_H2M_EX list, EXTRA_DIST it and mark as BUILT_SOURCE
fix, operate on int32_t's only in __tai_offs()

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
hygiene, emphasise const'ness of zif_t accessors

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Revert "fix, operate on int32_t's only in __tai_offs()"

This reverts commit 13fa137eb47ae7056563d57490370fd918fc1194.

Conflicts:

	lib/tzraw.c
minor, map leap second transitions to aligned address space

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Merge branch 'core/tzraw' into next

* core/tzraw:
  minor, map leap second transitions to aligned address space
  Revert "fix, operate on int32_t's only in __tai_offs()"
  hygiene, emphasise const'ness of zif_t accessors
  fix, operate on int32_t's only in __tai_offs()
Updated test case ordering; removed version and added it to the description field
Merge remote-tracking branch 'upstream/testing' into testing
Merge remote-tracking branch 'upstream/master' into testing
Merge remote-tracking branch 'upstream/testing' into testing
Merge remote-tracking branch 'upstream/gh-pages' into testing
Merge remote-tracking branch 'upstream/master' into testing
Merge remote-tracking branch 'upstream/testing' into testing
Merge remote-tracking branch 'upstream/testing'
Merge remote-tracking branch 'upstream/testing'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/testing' into testing
Merge remote-tracking branch 'upstream/testing'
Merge remote-tracking branch 'upstream/testing' into testing
Merge branch 'master', remote-tracking branch 'origin'
Merge remote-tracking branch 'origin/testing'
Merge branch 'testing', remote-tracking branch 'origin'
Merge pull request #1 from eucalyptus/testing

Updating my testing branch
Add group methods and display methods
Add exit code option for sys()
Merge pull request #2 from eucalyptus/testing

Updating my testing branch
Bug fix verification script for EUCA-3453
Bug fix is in eucalyptus testing branch with the commit # 0f62b5fddde9c360b17c8707e387c18a443fb370
Bug fix verification script for EUCA-2241.
EUCA-2782 and EUCA-2241 are caused by the same issue. Added a test case for EUCA-2241
Add vmtype arg, move create test case to base class
Add check for fingerprint when looking for local keys
Format for print groups method
additional debug around fetching services
move repo utils under check for package manager
Merge pull request #90 from swangi/testing

Scripts for verifying EUCA-3453 and EUCA-2241
Merge remote-tracking branch 'upstream/testing' into testing

Bringing in updated testcases.
Version Bump - 0.0.4
Version Bump
Merge remote-tracking branch 'upstream/testing' into testing

Merging new updates.
Added canonical_headers test case to confirm correct GET responses back from Eucalyptus Walrus when searching for buckets with CanonicalizedAmzHeader elements.  Behavior should match what happens on AWS S3.
Initial transformation to Oz
Added some buttons and toasts
sommaire des cours
Update .travis.yml for me
now.json
New dtx version of latex_resume!

- .gitignore: Add .cls
- example-zh.tex: modify according to dtx change
- format.tex, head.tex: no more dirty code now!
- latex_resume.ins, latex_resume.dtx: initial version with dtx
Working dynamic modal
Started new project
With this commit I've done the following:

* Added changes to map dimensions
* Added support for movement of sample avatar character
* Created object for Creature object
Added openbox configuration files
New menu generated by menumaker
refined menu generated by menumaker
Added mpd and ncmpcpp config and pretty much everything under ~/.config
137 Append doc
137 Append doc
started session functionality, tuning user stuff
Added polymorphic relations.
database constant, cleaner output
reformated jQuery again
IPv6Address: convert to Uint128 operator replaced to converter function
IPv6Address: added an another constructMask() function
MACAddress: let  the constructor explicit
added ManetAddress class

ManetAddress is a class for stores IPv4Address, IPv6Address and MACAddress values
RoutingTableRecorder: comment fixes
manetbase: sendToIp changes

add name for arguments
in 2nd, replaced int iface to uint32_t (represents an ipv4 address)
manet: replaced Uint128 to ManetAddress -- TECHNICAL, do not compile
manet: replaced Uint128 to ManetAddress - code changes
IPv6Address: removes Uint128 related functions
manetrouting: removed some sendToIp() functions

removed 3 from 5 functions
manetrouting: merged sendToIp() codes to a common base function sendToIpOnIface() used InterfaceEntry* parameter
manetrouting: AODV hand-written descriptors replaced with generated ones [with A.Varga]

aodv_msg_struct.h: added getter methods expected by the generated descriptors
removed hand-written aodv_msg_struct_descriptor.cc
manet/batman: fixed debug_output
manetrouting: uses ManetNetworkAddress
manetrouting: added tests
manetaddress: getters returns UNSPECIFIED_ADDRESS if addrType==UNDEFINED
manetroutingbase: typo
manetroutingbase: added documentations and FIXMEs; codestyle
manetroutingbase: added/modified documentations of functions, added parameter names
manetaddressbase: removed unused static variables
internetCloud: added cloudDelayerBase
--fix for initial
delayerbase
idelayer
clouddelayermatrix
Whole cities.txt file commited.
Minor changes.
Merge branch 'master' of https://github.com/inetis/autocomplete
adding a check to see if the data is set before using
change the batch file.
playing with reST for documentation - updated findKeypointMatch, this is basically the template for the rest of the functions.
Okay this is close, still have to deal with hole/island thing
closes #25
Merge remote branch 'upstream/dev' into dev
Merge pull request #26 from radekstepan/dev

Generic footer with Uni logo on all mines ala metabolicMine
refactoring DAO for a common Memory and SQL implementation
All the things

Added draw ordering to preserve z-order
Added hitbox macros
Replaced AABB with pygame.Rect
Merge branch 'master' of https://github.com/ionaic/the-only-one
Update docstrings, readme and shell command to use open_shell if no argument is given.
audit push
user login bug
Customized funnel templates/css.

Keeping the custom templates and images in overwrites/ directory and
copying all the files in it to root on `make copy` to install the
customizations.

This allows customizing funnel without modifying that repo.
Deleted txt file
File change
Rename integration activemodel => active_model
udpate benchmark by add c implementation
debug~~
[chat] Make Challenge and Chat button unavailable for current user.
[unittest] Combine messages test
[contactbox] Created a new file for contactbox:
- moved code from chatbox.js file to contactbox.js file
- little refactoring in this file
[contactbox] Refactoring code, moved contactbox and private-chat-boxes divs in site_base file
- same for css and js link
[contactbox] Make contact-box appear to player link.
[contactbox] Make contact-box appear in different position for case when appear in global-chat-box or other places
Tabs module
got jdbc inserts working
Fixed bug in where resource element was not set as a parent of it's
content element. Implemented remove on jdbc resource tree.
new: add handler for current domain unhandled exception
normal user cannot delete course
Adjust Color scheme to offical CouchDB colors
Add oliver kurow to organizers
adapt style to offical website
Merge pull request #4 from lucidNTR/gh-pages

New style Bitch! Pull me in.
fix gemfile issue with active admin
Setting C-a to select all was extremely stupid!
offer styling
added optional feedback params when requiring login
go back to last place in file after loading
Set hero-unit h1 font-weight to normal
Implémentation des Property beans pour le JVSFile et correction de bugs mineurs
added first version of project files
still working on the Builder Pattern Practice classes
Upgraded to latest version of Selenium
A few instructions were renumbered: bring the simulator up to date with those.
- ‘.crypte/EIG,YqXHb-7g5LKvDPHWM6OXFXK6ZoRX0jAvZUBudREfNsgLM7skkrqmqrzlYL3hXg1/Ht,icHAu9IdrHTIzTOf3Fo,z’
Species autocomplete field for map
[notes]
- Saving of registrants is now possible.
- list of registrants is now visible.
- fixed version of ninject used.
Fix bug where latest version was not properly parsed
fix bug with wrist/waist
Revert "Revert "WorkItem: 4707 Start to the filter for watertight security (admins and readonly so far)""

This reverts commit 8d4a1e9dcfe067eae79aa0b5e61a02f69ab12ac7.
WorkItem: 4708 Standalone iterations seem to be working now correctly.
WorkItem: 4708 Fixing up some jUnit stuff and cleaning up.
Merge branch 'master' of https://jebaldwin@github.com/Agilefant-Finnucks/agilefant.git
WorkItem: 4707 Put back filter stuff but commented out the XML files,
the user is null on certain calls and it causes things not to work
Generated User

rails generate scaffold User name:string email:text
Added update_status method to API
setting up scribe
clean
clean
clean tvrage results
Updated doc.set with merge test to include info included from getters
Changed to USGS license
Bright-theme done!

Still… the css needs some refactoring or something
Updated api-config doc-src with the new option
added new document and question_response seed data.

modified lookup list and element to handle pick lists.
Converting new project entry to Bootstrap style. Added created_by to table inserts.
Adding xls extension to output file to force Excel to handle the data.
Always try to load graphing, but fail gracefully
can set icon for option button in application bar
Revert "Make sure all schema-library versions are 1.0.4-SNAPSHOT"

This reverts commit 191979dca5b11b240e6feb0009a35c89b37c6d68.
Bump documentation versions to 1.0.4-SNAPSHOT
Finish ping rest webservice example
Add SOAP/REST web services documentataion
Fix opentravel web service project names
Move touractivity archetype to opentravel.org project
Initialize git
add
111
add 2
Merge branch 'master' of https://github.com/jimmyyem/jimmy-blog
修改readme文件
修改文字
pretty oneline logs with author names. "%s" pretty format does not
play well in zsh, hence the quotation hack.
me me me me....
added the 'i' alias for install brew or apt-get
and added the 'up' alias as well
adding sublime ignore files
adding user-specific.zsh to gitignore
adding quick access links to zshrc
custom files should be loaded after everything so that we can override anything in the custom files
customizing the kitallis-darkblood theme to show ruby versions on the right prompt

This does not have any impact on the responsiveness of the shell.
That might be helpful
update requirements for v0.2
update README for v0.2
bump version to 0.2.0
Starts adding ant script. Adds script allowing to create raw video from images
Adds max image limit to avoid errors; start searching for image orientation in exif files
Solves cropping problem. Cropping does not need big image any more
Creates compile and clean targets
Adds doc target
Creates executable target for creating the exe file
Adds package clean target. used to remove all undesired ressources into current folder
Adds several packages targets into build.xml
Finishes first version of ant script. Everything seem to be automated
Merge from master. Corrects imports problems
Quick fix Linux Video Capabilites for ignacio martinez
Modifies targets and setup.py to allow packaging in Linux
Changing codec for ignacio
Simply adds print message
Reference problem solved. Chosen reference is smalest face now
Removes the equalization option. It is obvious people want to use it
Simple fix. Sub folders are not taken into account
Prepares os.walk listing.
Subfolders are now also searched for files
Updates version and README
that ribbon is fixed
Allow playground to handle frames separately from contexts and allow permalink to specify a startTab.
Add local VIM config to spf13-vim
I have trouble seeing the text highlighted by the spellchecker, so this disables it
Add Jade bundle to spf13-vim
Commit to some other branch
NodeJS Recess
soporte movil coche Golf
porcaria com o git 4
Auto-update: 17-Dec-2012 10:36:24
Auto-update: 17-Dec-2012 11:39:24
Auto-update: 29-Dec-2012 13:30:48
More sensible gui settings on GVim Ubuntu
Fixed rss scores import
Remove unused JDBC Driver registration

Conflicts:

	dbpool/src/main/resources/META-INF/services/java.sql.Driver
Helvetic Neue Light default
Remove unneeded <a> tags in main slideshow.
주민번호 마스킹 필터 리팩토링
Moved more libs from webinf to common
Updated README and added Snippets
no examples dir
Updated api host and interface
adjust for non admin user
add optional support for socket.getfqdn

For my setup I need to have the fqdn used at all times since my
hostnames are the same but the environment (among other things) is
found in the rest of the FQDN.

Since just changing socket.gethostname to socket.getfqdn has lots of
potential for breakage, and socket.gethostname doesn't always return an
FQDN, it's now an option to explicitly always use the fqdn.

Fixes #68
Merge pull request #69 from kitchen/fqdnoptional

add optional support for socket.getfqdn
Update index.html

Updating docs for zmq transport method
Update index.html

Fixed bad copy-paste job.
Merge pull request #19 from librato-peter/gh-pages

Fixed bad copy/paste job while updating docs for ZeroMQ
Made the whitespace config no so restrictive
Provide fix for deleted playesr bug affecting game listings. This is a workaround, fix should be recorded against #44
Remove body height 100% so bottom gradient stays at the very bottom of the page
Adding further partials for logged-in player
server and readme loaded
added rubyracer heroku