labofsahil/github-event-dataset-2012 huggingface dataset:
Another unsuccessful try to get unaligned memory access error in Ballfield
Updated SDL 1.3 to the latest libsdl.org - it's now named SDL2
Compilation fixes for SDL 1.3/2.0, Alien Blaster compiles but does not start
A couple of introductory rooms to the Castle
test the header is included
BE: add dashboard label
added Gui
added Gui
first few blocks converted
ForceLatinPaths: the colon needs to go earlier in the character set.
renamed zendesk-api.rb file to zendesk_api.rb. fixes bug with bundler replacing dashes with slashes for files names
Merge pull request #22 from jordanandree/master

Updated compatability with bundler
UPdated path for test package
Revert "add branch to travis" cause it breaks the build

This reverts commit e5fef1805991794760d2d9b0a97c43b10380fc38.
Corrigindo link do mapa
SAML Metadata Support configuration changes.
Merge pull request #144 from pedroigor/master

SAML Metadata Support configuration changes.
Add Changes for further Parsers from other ILS
remove
and readd
Integration with Travis: added 'pip install pysqlite'
cv_bp: fix cmake findnumpy module

The search for the numpy include directory was incorrectly adding
'numpy' to the end of the path as this is where arrayobject.h is.  The
correct method is to just return what numpy.get_include() returns.
cv_mat.cpp was already correctly expecting this path.
Merge pull request #24 from jsbronder/for-upstream

cv_bp: fix cmake findnumpy module
Added slideshow plugin file.
Fixed settings to lockdown default sqlite db path.
dramalinks incognito adjustment
initial work on edge detector
Pocket (Read It Later) の修正パッチ
enable search box in admin
gradleのeclipse設定
購入時のspecに預かり金も追加
moneyFlowをprivateに。
javadoc記入、メソッド位置移動
在庫情報取得はStockReportクラスを返す
JuiceRack#getJuice()を消すメドがつかなくなった
Initial setup node environment for nodejs:

1. filetype detection
2. utilities for node filetype
3. basic syntax highlight
syntax fix, versiopn bump
Merge branch 'hotfix/hotfix-setup-16-syntaxerror'
Exclude None values when checking if a field may be validated as unique
Merge branch 'feature/skip_none_values' into develop
refined background pages and added OAuth
Update console/README.md

Add description of the "suffix" parameter in api.yml
BZ859541: Add stickshift-node.conf as a config file (noreplace) for rubygem-stickshift-node
Allow downstream consumers to override variables easily
Ensure Gemfile.lock is removed post install and its absence doesn't delete the file.
Merge pull request #597 from pmorie/bugs/859541

Merged by openshift-bot
Rename pass 1: files, directories
Rename pass 2: variables, modules, classes
Ensure static assets are compired and digests are enabled for production mode console.
Renaming 1.9 cartridge to openshift-origin-cartridge-ruby-1.9-scl
Rename pass 3: Manual fixes
Automatic commit of package [openshift-origin-broker] release [0.6.11-1].
Automatic commit of package [openshift-origin-broker-util] release [0.0.5-1].
Automatic commit of package [openshift-origin-cartridge-10gen-mms-agent-0.1] release [1.15.4-1].
Automatic commit of package [openshift-origin-cartridge-abstract] release [0.17.12-1].
Automatic commit of package [openshift-origin-cartridge-cron-1.4] release [0.10.3-1].
Automatic commit of package [openshift-origin-cartridge-diy-0.1] release [0.33.5-1].
Automatic commit of package [openshift-origin-cartridge-haproxy-1.4] release [0.16.4-1].
Automatic commit of package [openshift-origin-cartridge-jbossas-7] release [0.98.3-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap-6.0] release [0.6.3-1].
Automatic commit of package [openshift-origin-cartridge-jenkins-1.4] release [0.98.5-1].
add the documentation folder
Added resource server dependency details
pcm2pwm specs
specs simplified. pcm2pwm spec for names with spaces added
TODO updated supplementary file inculded
Added Capistrano for deployment
removed apache-cxf-contract-first
Updated more styling

Tweaked more styling and added a started bio.  Also removed the silly image at the bottom.
Briefly touched the styles

Just slightly updated the styles
Fixed ending quote in pod entry in README.
Save watchers
SoundManager now takes in a Data object, which is filled out in main, instead of a pointer to main.  More of these style of fixes to come...
SoundManager now takes in a Data object, which is filled out in main, instead of a pointer to main.  More of these style of fixes to come...
Fixed bug with PlotCircularWeb / proportional.radius
.StripWhitespace() has better regexp and a test plan
Better checks of trophic-link names in Community()
Updates from Dan's review of vignettes
Improved pagination
Reformatted a couple of plots
Reformatted a couple of plots
Reformatted a couple of plots
Basic support for LESS
Refactored file watching functionality
Added watch task for LESS
Refactoring CakeFile to be slightly less insane
[jslint] scrollable/scrollable.js
Added dependencies for logback.
Merge pull request #147 from rackspace/sethbrayman

Added dependencies for logback.
even betternow
Add found pears to counters
updated the asset precompilation and made small height adjustment to content section of therapists page
Fixed Ticket Number 893 - New glyphs are inserted right on top of each other
Adds update and restart commands.

Refactors management and diagnostic commands into manage.rb.
Starts template of send_log command, but not complete.
static page commit
Added shape analysis
Added shape analysis
Merge branch 'master' of github.com:ravikiranj/misc-tools

Conflicts:
	resume/ravikiranj.pdf
Added new resume
Changed player key to player.name from player.id, to be able to get own
position more easily, now firing at multiple targets

Signed-off-by: raph <raphael.catolino@gmail.com>
factorial solved
updated README
Merge branch 'master' of https://github.com/rderoldan1/learn-ruby
Converted admin.js. Added a few more translations. Removed modehate functionality. Changed some stuff in run.js to facilitate changes.
Move document to library. Add Gateway to stub open-uri
Now including break stat in feature vector; fixed ordering of trends stats
added test data; started testing forma.clj namespace with small-sample data; got rid of previous tests that were almost all based on schema objects, rather than thrift objects.
working, relatively small tests for three steps within scatter.clj / three functions within forma.clj
removed unneccessary imports
fixed thrift bugs in combine neighbor functions
tests for forma.schema are working; now onto fixing other functions that may have been affected by changes to forma.schema (bugs unearthed by the forma.schema testing) before sending a pull req.
added empty-neighbor-val
adjusted forma.ops.classify to reflect FormaValue change
ignoring .crc files
removed local test data
Merge pull request #119 from reddmetrics/feature/schema-test

Feature/schema test
Simplifying cleaning to just do telescoping
Leave Ken as an author.  He deserves credit.

Even if his tests are terrible.
Version bump to 0.1.0
Jeweler installed
Se agregan imagenes y se cambia el layout de la pagina
promlem 2
Added a database like a boss
whoo hooo finally got security using fluent nhibernate to work
working on the billing stuff
working on the sessionverification page
v0.9.6.7
Python 3 support though distribute package.
ReStyle of registration page
added a bit of rssness
Adding an "off" tint color property
Added php/getLoc.php, php/getAlt.php.

Started reading into location data.
Initial commit to master branch
Temporaray rollback.
Test image report
Update helper variable
Updated hint file crutch
Added md5 and json upload
Forgot the metadata
Missed an end statement
Update to new helper variables
More updating
Forgot another end statement
More crutches-- logic later
Fixed filename typo
More helper macro updates
More helper variable changes
Pre-mature optimization in each and graceful failure in report_tool
Only single md5 per json blob
Refactor to fail gracefully on missing files and create hint file
Run before the volume is copied
Variable typos
Tweak column width in admin for french translation
Update admin map - icons on map
Added another lovely polar bear image.
Make a basic User model (including secure password). Failed to mention the following in previous commit: Add basic Users controller.
Finish user signup
Add SSL in production
Finish sign in
Initial commit to feldtruby.
manually merged conflicting files
added more new files after starting to use jeweler
Tweaked db file
Add grb256 colorscheme.
completamos el grupo
Add Drupal 6
Remove custom response header before sending it
skandiabanken sponsor
removed regex validation of phone number as it was just complicating the registration process for users with odd phone number formats
made it possible to not submit gender
Merged in changes from prod...
Need to refactor write() method
Practice OOP polymorphism from net.tutsplus.com
user script for grease monkey.
Keep text in browser.
Commiting test file from MSEE computer to repository
finished Grobform.
Add packages.json for Sublime Text package control
completed except with an issue of batch process
fixed compilation on 1.7.0. isWithinDefined is no longer present
sometimes file can be null (e.g. when rails app is launched from trinidad server)
Create configuration for NAND flash. Add corresponding scripts
rename
Shuckin' and jivin'
.gitconfig update
Git shortcut update.
Subproject commit
Git and ZSH tweaks.
Merge branch 'master' of https://github.com/ryanpetrello/dotfiles
Changing status line to vim-powerline.
vim-powerline tinkering...
Hide intro message.
More color tinkering.
Tabs for perl.
12 hour status clock.
More .vimrc tinkering.
Merge branch 'master' into debian

Conflicts:
	.tmux.conf
	.vim/bundle/pytest.vim
	com.googlecode.iterm2.plist
ack version compat.
Using ST_ instead of STER_ macros
Have users direct to Google logout on signout

This will allow them to signin with a different account.
Have tamplate view use standard nav template as others
Add site_url around menu items
Add menu dropdown for administrators to edit tables
Create assignment page that includes counts of problems completed
draw chart statictc
- AuthorizeGuard
activity & guard configuration XmlElement => IDictionary<string, object>
The generic Service<R> superclass is now aware of its record Class<R>.
Js files reorganization
trying to get connection right after a timeout
Modified to serve PHP files as PHP.
Draw background on canvas
Functional code done. Theme, OpenID, Login protected pages & Forums TODO: UI and Styles
NetworkPlugin python version
Add UserProfile model
Show profile info
Merge branch 'dev'
[2541] Improve script for Jeklik - Zul'Gurub

Notes:
Bat riders require additional research in therms of summoning and movement
Spell 23969 requires core support
error event instead of failure event
no junction table for self associations
multiple import calls
protocol for postgresql
Update 2012/5/15 19:43 'Beta 1'
Added syntax highlighting for some custom filetypes
Now old points get removed
Merge branch 'master' of git@github.com:secretmike/bigbrother.git
Merge branch 'master' of git@github.com:secretmike/bigbrother.git
[t787] review changes
New NSDate methods isToday, systemTimeRepresentation, weekDayName
New NSApplication method - isMountainLion
Rename methods xFormat to xRepresentation
README changes
C'est magnifique, mais ce n'est pas la guerre!
	[It is magnificent, but it is not war]
		-- Pierre Bosquet, witnessing the charge of the Light Brigade
Fixed wrong function call

Was calling byebye() instead of gz_ak_byebye().
updating data
Merge branch 'master' of https://github.com/seydar/art_classifier
Adding solution of 7th problem
Winterize updates
- Template y operacion para crear un nuevo grupo
- Formulario de aplicaciones. Pendiente de corregir
fix checkETIUp, add test

serves me right for not adding the test beforehand.
Add ReadChar.c

Signed-off-by: Guo Shaojun <shaojun.guo@kindroid.com>
Type.BuiltinClass subclasses should be singletons
Changed getMovies function for pagination logic
getmovie()
Revert "Bootstrap Sunday"

This reverts commit 39eb16c3769d0800a982ef18d35719746f21740f.
Revert "Revert "Bootstrap Sunday""

This reverts commit 35e13595ea21eda06a00c0974d2268e05e44e6d3.
ignore this
rubbish
edit topic UI
Updated multitask logistic regression
Merge branch 'slep' of git://github.com/lisitsyn/shogun
[SHRINKWRAP-413] Add a UUID field to Archives; update the Serialization mechanism and account for backwards-compatibility in the wire protocol.
don't try to read x properties if we don't have data points
Merge branch 'master' of github.com:shutterstock/rickshaw
FEATURE: implement SS_Sortable->reverse()
API CHANGE: SQLQuery:: now an array object rather than string. Existing strings will continue to work
Merge pull request #321 from silverstripe/sqlquery-enhancements

FEATURE: implement SS_List->reverse(). API CHANGE: SQLQuery:: now an arr...
Merge pull request #256 from halkyon/cleanup

GridFieldDeleteAction minor tidy up
first file upload
Merge github.com:siovan/emacs24-inkpot
Bumped copyright to 2012
Fix unicode issues in cleanup script
Merge branch 'master' of github.com:sirikata/sirikata-cdn
Reactivated Record-related functions in RunTime.oz.
Update src/FeatureExtractors/extractGabor.cpp
Fix issue with event callbacks be shared across classes
Fixed Gemfile attribute removal so the first line doesn't get touched
Eliminated border-inset, went back to current absolute content-inset, added editor-inset to CPTokenField to make input line up with tokens
another push. fixing intro descriptions
merged rel20 branch (upto r3441) back into trunk

git-svn-id: http://sphinxsearch.googlecode.com/svn/trunk@3442 8b96e2b9-35c5-2c16-bc47-5122d61876d4
small exception/wordform/stopword files are now stored in .sph

git-svn-id: http://sphinxsearch.googlecode.com/svn/trunk@3182 8b96e2b9-35c5-2c16-bc47-5122d61876d4
1.1.6 パスの柔軟性強化（上層ディレクトリからの呼び出し）
1.1.7 エラーメッセージの表示最適化
Empty accept-encoding is dropped (#40)
brushing up timeout sections.
Refactored: use the @ reader macro instead of deref
Poll the participants automatically
WOBS-1282: Changes to user profile

Disable pagination if < 10 items.
Debate comments direct links fixed
CS-4128: Community ticker doesn't work and crashes front page

Fixed.
WOBS-1484 - Adjustment of User Profile Dashboard

adjusted
Add a hacky fix to work around a bug in nose when running 'setup.py nosetests'; TODO: Submit bug report and maybe a fix to nose.

git-svn-id: http://svn6.assembla.com/svn/pyfits/trunk@1946 ed100bfc-0583-0410-97f2-c26b58777a21
Fixes #193

git-svn-id: http://svn6.assembla.com/svn/pyfits/trunk@1947 ed100bfc-0583-0410-97f2-c26b58777a21
Not that the card length ever changes for FITS, but might as well stay consistent and avoid magic numbers.

git-svn-id: http://svn6.assembla.com/svn/pyfits/trunk@1948 ed100bfc-0583-0410-97f2-c26b58777a21
Fixes #194. Also made KEYWORD_LENGTH a constant in case the maximum length of FITS keywords ever changes (hah). The conversion over to using this constant probably isn't perfect, but we'll worry about that only if it ever really matters.

git-svn-id: http://svn6.assembla.com/svn/pyfits/trunk@1950 ed100bfc-0583-0410-97f2-c26b58777a21
Fixed update getting stuck.
add Gemfile, .gitignore, update and rename .gemspec
add files for subpod and state classes
update fixture file with current boston xml
improve readability
include tests in Wolfram namespace

add read_fixture test helper method
add hash_presenter to present result as hash
convert readme to markdown
bump to version 1.3
RSS Feed deleting fixed. Closes #954
Merge branch 'release/2.32'
Translation fixed for some forms and extension for saved localization.
Dancer alpha release
Documentation
add styling for comments (still needs some tweaking), adjust events styling
Merge branch 'master' of github.com:sphillips/campus-taps
Implemented XML view for Rooms#get_visitors
whitespace
[768] allow SC.SplitView to mixin SC.SplitChild
Sort prototypes.  No functionality change.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@160215 91177308-0d34-0410-b5e6-96231b3b80d8
Remove unused method declaration.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@160216 91177308-0d34-0410-b5e6-96231b3b80d8
Hoist CFG builder logic for '&&' and '||' into helper method.  No funcationlity change.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@160217 91177308-0d34-0410-b5e6-96231b3b80d8
Refine CFG so that '&&' and '||' don't lead to extra confluence points when used in a branch, but
instead push the terminator for the branch down into the basic blocks of the subexpressions of '&&' and '||'
respectively.  This eliminates some artifical control-flow from the CFG and results in a more
compact CFG.

Note that this patch only alters the branches 'while', 'if' and 'for'.  This was complex enough for
one patch.  The remaining branches (e.g., do...while) can be handled in a separate patch, but they
weren't immediately tackled because they were less important.

It is possible that this patch introduces some subtle bugs, particularly w.r.t. to destructor placement.
I've tried to audit these changes, but it is also known that the destructor logic needs some refinement
in the area of '||' and '&&' regardless (i.e., their are known bugs).

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@160218 91177308-0d34-0410-b5e6-96231b3b80d8
Simplify. No functionality change.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@171268 91177308-0d34-0410-b5e6-96231b3b80d8
[cindex.py] Add helper to initialize libclang functions

The helper allows us to define how the initialization of functions should
behave. We use this patch to provide an informative error message, in case a
function is not available:

"LibclangError: /home/grosser/Projekte/llvm/install/lib/libclang.so: undefined
symbol: clang_method_added_in_2020. Please ensure that your python bindings are
compatible with your libclang.so version."

This patch also ensures that no spelling mistakes slip into the library
initialization. At the moment, there are a couple of 'argtype' -> 'argtypes'
mispellings that have been overlooked.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@163057 91177308-0d34-0410-b5e6-96231b3b80d8
Revert this to try to bring the i386 bots back.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@161931 91177308-0d34-0410-b5e6-96231b3b80d8
Fix default cpu for -march=armv5e.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@155540 91177308-0d34-0410-b5e6-96231b3b80d8
Clang driver support for linking on Android.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@155541 91177308-0d34-0410-b5e6-96231b3b80d8
modern objc translator: avoid some duplicate declarations.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@153674 91177308-0d34-0410-b5e6-96231b3b80d8
ARM backend knows about cortex-m4. The front end should too.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@153678 91177308-0d34-0410-b5e6-96231b3b80d8
Forgot to rename one use of FPContractModeTy

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@159796 91177308-0d34-0410-b5e6-96231b3b80d8
CommentParser.cpp: remove unused variable.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@159797 91177308-0d34-0410-b5e6-96231b3b80d8
Comment parsing: retokenized text tokens are now pushed back in correct (not
reverse) order


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@160675 91177308-0d34-0410-b5e6-96231b3b80d8
[driver] When creating the compiler invocation out of command-line
arguments, force use of clang frontend for the driver.

Fixes rdar://11356765.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@157205 91177308-0d34-0410-b5e6-96231b3b80d8
Produce a hidden symbol for zed in

  struct HIDDEN foo {
  };
  template <class P>
  struct bar {
  };
  template <>
  struct HIDDEN bar<foo> {
    DEFAULT static void zed();
  };
  void bar<foo>::zed() {
  }

Before we would produce a hidden symbol in

  struct HIDDEN foo {
  };
  template <class P>
  struct bar {
  };
  template <>
  struct bar<foo> {
    DEFAULT static void zed();
  };
  void bar<foo>::zed() {
  }

But adding HIDDEN to the specialization would cause us to produce a default
symbol.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@157206 91177308-0d34-0410-b5e6-96231b3b80d8
Function template version of the previous patch.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@157207 91177308-0d34-0410-b5e6-96231b3b80d8
objc modern rewriter: allow translation of
multiple declaration of block variables
(with no initializer) on the same line.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@155462 91177308-0d34-0410-b5e6-96231b3b80d8
test/Driver/crash-report.c: Small tweaks. 1) Use %t instead %T for TMP. 2) Set all of $TMPDIR, $TEMP and $TMP, or a certain host might set $TEMP.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@160342 91177308-0d34-0410-b5e6-96231b3b80d8
[Win32] Rework crash-report since r145389.

  - lib/Driver/Driver.cpp, tools/driver/driver.cpp: Exit status should not be propagated, although clang driver should catch exceptions.
  - test/Driver/crash-report.c: Add REQUIRES:shell for now.
    FIXME: setenv should work also on Lit.InternalShellRunner.
  - test/Driver/crash-report.c: Remove XFAIL.

Thanks to Chad, To point out the issue.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@160343 91177308-0d34-0410-b5e6-96231b3b80d8
Fixed Android phone unit test
removed stupid header commets
messing around with display int data types
add explicit base 10 to usages of parseInt

Weird/random things such as parsing as octal numbers tend to happen otherwise.
detailInfoItem: to not expect the value to be a string

It can also be an object with its text in the #text property
when the pz:metadata field has attributes. Handle that situation as well.
add useMaps option

If a pazpar2 record contains the 'mapscale' field which contains:
* as text Marc 255 $a
* as attribute projection Marc 255 $b
* as attribute coordinates Marc 255 $c

then display the merged scale(s) and if the coordinates attribute
exists insert a map with rectangles for all the areas..
fix typos / improvements
remove sid configuration from JavaScript client

it has to be provided by the proxy setup now
add ability to display parent-catalogue-link for a location

Refactor the catalogue-link code to simplify that.
correct comment
simplify insertion of export links

make its structure the same as that of the other elements
error now takes HTTPBody instead of Any

- Any was always a poor choice. The value is set as the body anyways, might as well force conversion to something valid instead of obvious surprises when using Any
- removed isEmpty variables that were useless.
add optional HTTPBody to HaltRes
scaladoc
convenience methods for building `ResT`s
type aliases and convenience for wrapping [A]State[ReqRespData,Res[A]] in ResT
fix namespace collision issue

was overriding implicit for same name. cause by importing Res._ and scalamachine.scalaz.res._ in the scalamachine-scalaz7 package.
Merge pull request #6 from stackmob/better-error

Improve `Res`
Add new js binary which has support for default arguments
add different programs depending on battery type
Initial Version
Refactored directories
Added unit tests
Corrected bug with _lastFound and now checking to see if the tree is correctly empty
All tests pass
Published to NuGet - version 1.0.4583
Cleaning it up
Merge branch 'master' of github.com:stenehall/nanoc.oe.is
Whoops - Houdini plugin
added some sys admin aliases so I can stop googling for them all the time
getting used to markdown still still still still still still still
Toast results, removed more extraneous libs and code
Changing video to YouTube
remove fov
Merge branch 'master' of github.com:stuntrally/stuntrally

Conflicts:
	source/ogre/SplitScreen.cpp
camera rays hit fluids surface (fix tilt on Swamp,Mudbath,etc)
Create button event

This change creates the button event.

Testing done:

VDD suite.
Change StopEventException's ancestor

This change switches StopEventException so that it descends from
RuntimeException rather than from VDDException.  The reasoning is primarily
so that an event's execution can be terminated due to a runtime error
(rather than an exception) without going through contortions or without having
to declare every method to throw StopEventException.

Testing Done:

VDD Suite.
Create runtime error method

This change creates an error reporting method in Event that reports the error
and then terminates the event, desirable behavior for runtime errors.

Testing done:

VDD Suite
Create new replacePair method in ActionList

If a child event will override a parent's action, it needs to be able to
swap its own object in in place of the parent's action.  This change adds
a replacePair method to ActionList to allow that to happen.

Testing done:

VDD suite.
Implement Filefield

This change implements the filefield event.

Testing done:

VDD suite.
Why the tuple? Doesn't make sense. Just return a string or None.
removed an errant reference to the deleted Stanford node
put requested depth, stencil and alpha bits in static variables

git-svn-id: http://processing.googlecode.com/svn/trunk@10425 fe3ceab9-de17-3b67-bb2e-7d58edd5e4d6
save changes
Merge branch 'master' of github.com:swwl1992/CS2103G30V01

Conflicts:
	CS2103V01G30.suo
minor changes in GUI for venue
Layout Improvements CSS
Update .travis.yml

Update Travis as has new build out structure
added missing property declarations
2d 벡터필드 클래스 작성 시작.
corrected a syntax mistake in architecture file
added a todo in the generic controller, to have a configurable redirection to the website 'root'
replaced the include's DEFINE by one not related to Tatoeba
forget to add a ifndef in the model template header, corrected
added a tool to generate an empty form, the goal is to be able to easily create working (fill_form_page + treat_form_page + form)
added instances 3 and 4, find-links
add hobo_bootstrap to plugins
rake cookbook:pull_all
Cosmetic fix. thnx @staabm
Merge pull request #1 from tanghus/master

Added Compound property
Added unAttack method for use with undo
Merge pull request #11 from tawarisch/PIC18_master

Pic18 master
Fix Bug in Erase_Flash Function
sometimes the receive-function is to fast, so I wait 50ms after every command to the PIC
ADD Format Guideline
I will update the source code to this format in the next time. Step by Step
Merge commit '5a6f41e597d62234417ee1be9deb68c0b9860346' into PIC18_master
Change Format of some Functions
#Bug: Set Color and SetFade works fine, only if there is one LED set with a other color and I start a Fade, the Result is not nice
BUGFIX: Fadeoperation with different startvalues is possible now.

Erklärung: DoFade darf nur alle 0,75ms ausgeführt werden, weil die LED-Controller ca 0,4ms "ruhe" brauchen um den Farbwert zu aktualisieren. Erst nach 0,4 ms ohne ClockSignale an der SPI-Schnittstelle übernehmen die LED-Controller den Farbwert. Senden wir ohne Pause, wird ein zufälliger Wert übernommen. Update Fade können wir jedoch wesentlich öfter ausführen.
fixed naming
implemented basic trace macro

CC8E is complaining about constant if(condition) which makes comfortable macro unusable. Different trace levels are inefficient too, so we wont use them :-( deactivating CC8E warnings wouldnt be a good idea either so we have to work with these macros
- clean up trace changes
- remove warning in commandstorage structure
fix comment
He has an array of comebacks!
Skinning code.kylo.tv
Skinning code.kylo.tv
Abort task chaining if Java sources compilation (lein javac) fails

Fixes #658
empty activity names bugfixes
update for required packages and note about bigdata project
renaming and conventions
solve p20 closed #22
(fixed) last commit
tcc impl finish
addin v.2
adding comments to SMP function
changed some silly links, close #8
It's probably best to keep CSS stuff out of 4chan X as much as possible
Added roboguice and its dependencies.

Updated HomeActivity and StartGameActivity to pass extras via Robojuice injected extras.
Injecting views into Activities rather than using "findViewById"
Updated one of the button listeners to use the setOnClickListener() instead of setting it in XML.
Reload Schema
Fixed MySQL Error when sorting by Labels in Directory
Reload Schema
Remove unneccessary files
Merge branch 'master' of https://github.com/thelabtech/missionhub into MH-326
Minor Changes on Import Contacts page
fix bug in ccc/person.rb
add rails-footnotes
don't die just because fb update failed
Merge branch 'good'

Conflicts:
	Gemfile
	app/models/answer.rb
Reverse a change from bceaac2
fix MH-431

when re-importing people who had been deleted, the contact role was not
getting un-archived
remove the need for the friends table
add writer methods for address stuff
delegate address methods to current address
stop deleting current address
fix gender field
remove raise statements
optimize the all contacts screen some

more optimization is needed.
fix tests
one more fix
hid ugly date picker box
hide bulk send feature
reload schema
What will happen when org does not have a keyword
Some test. Still further fix needed.
improve performance by caching Movie pixmap representation. Accidentally, this decreases memory usage because one pixmap is cached instead of two (thumbnail + text). I was so dumb...
improve startup performance by loading movie thumbnails from cache asynchronously
improve performance by giving worker threads an IdlePriority. Looks like shit, because QtConcurrent does not support priority changing, but it works
loading image needs caching too
greatest performance improvement: text rendering in separate thread
Removed ruby 1.9.2 from travis config
#127 Intégration eliot-scolarite-commons 2.7.1-RC1 + retour liquibase 2.0.1
Merge branch 'dev/116' of github.com:ticetime/eliot-tdbase into dev/116
merge dev/116 in master
#121: Gestion d'une image attachée à un item quelque soit son type
Traitement du document attaché principal dans le cadre de l'édition d'une question dans un sujet [partiel]
deleted notes
notes
Schleife erstellt.
login fixed, e-mail fixed
copy paste error 1 -> 2
Change logic with receive webhook
Remove unnecessary comments
Remove blocks templates that are not compatible this version
Cleaning the code, add methods used in build data to communicate with the API
Simplify the templates
Add underscore to prefix used in delete config entries query
Add exception if send order response status is not 201
Extend oxorder class. Add Send order request to API before finalize order.
Move most unnecessary logic to special helper class. Use parent call of overriding methods instead ugly hardcode injection.
Change current version to 0.8.1 and handle errors if database query will be failed. Show message with instructions to the user if somethng goes wrong.
Merge branch 'fixrevsion1' into 4.3.2
Totally BossTerminal was done.
simplify to keep more logic in layout
import baseboxes from from public dropbox url rather than local file
added support for manual journals
tidy exception classes
fixed noid count
Turn off log messages in hopes of better performance.
Speed improvement by modding out some symmetry in the socle
Fix skipping heuristics to be compatible with term ordering
popravljena valicacija pri dogodkih
Use vim directory, rather than src directory
JBTM-1353 Remove old tests from XTS
JBTM-1353 Remove old tests from XTS
JBTM-1360 updated the path for orson in build-release-pkgs.xml
JBTM-1289 XTS participant completion tests should use a rendezvous to delay close until participant has completed
small fixes to make project work better
Change `flipud`/`fliplr` to array indexing.
Add alternate example for `match_template`.
Check that image is larger than template.
Probleemke opgelost op portal
Added a test case for amol's validation situation.
Supress top-level validator messages if they also apply messages to compound widget children.
Try working without base tag and inserting site.url field everywhere.
removed public index
index update
higher level logic for user synchronization
Support new format of specifying env vars

Before this commit, the only way of setting up ENV variables was to use
env key in travis.yml, for example:

env:
  - FOO=bar
  - BAR=baz

All the elements are then expanded into matrix, so such env array will
result in 2 tests runs. With FOO=bar and then with BAR=baz ENV
variables. The problem with such approach is that in order to specify
ENV variables that are available globally, you need to add such vars for
each line, for example:

env:
  - FOO=bar SOME_TOKEN=abcdef
  - BAR=baz SOME_TOKEN=abcdef

New format helps in such situations by allowing to specify lines that go
into matrix and lines that will be available globally:

env:
  global:
    - SOME_TOKEN=abcdef
  matrix:
    - FOO=bar
    - BAR=baz
Merge pull request #91 from travis-ci/global-env

Support new format of specifying env vars
adjust pull request test payload for new github api
Merge branch 'master' of github.com:travis-ci/travis-core
Merge branch 'master' into pr-testing-for-all
always accept pull requests for now
move email broadcasts to the event handler and pass a param to tasks
check presence of recipients/targets in event handlers
send build:created and job:created, add result, started_at and finished_at to job:created pusher payloads
Add full payload for repository in pusher
use async strategies
comment out checking for short urls for now, not used anyway, should move this out of the tasks layer
symbolize keys after going through sidekiq
refactor event handlers to be less expensive
no need to check run? for tasks since that should be done in the handler, really
check presence of recipients/targets in event handlers
default task data to an empty hash here
rescue before instrumentation and go through the :notify class method
add sidekiq defaults to Travis.config
1.9 gemfile
use travis-support/master
Add state to job:created event
Attach job_ids to build:started event

We already push information about jobs in matrix, so this is a small
addition just to play nicer with ember-data.
actually return the queued jobs
move active_record log subscriber to travis-support
move queueing logic to a service, invert the job/owners loop, return a report about jobs queued etc
Merge pull request #127 from travis-ci/sf-queueing-service

move queueing logic to a service
move github services stuff to services/github
move GH setup to Travis
make sure hub request and sync logging gets through to the logging publisher
fixes Ruby 1.8 issue #49
Fixed planetary positions. All are displayed correctly.
escaped token
remove unused variable in Makefile
using jquery in index.html will make life much easier
initial structuring for readGlobalReg()
Added some general documentation.
Merge branch 'master' of https://github.com/tstullich/WASC-Engine
Added page subtitles for user and pseud pages and the works index by tag; modified the way page titles are put together in the layout
Added subtitles to user's bookmarks and gifts
Added page subtitles to collection index, collection home and profile pages, pseuds and series lists by user
Added import subtitle, added subtitles to fandoms and bookmarks in a collection, added subtitle to fandom indexes by media, removed page_title definition from feedback page
Working on alt text for collections
Countdown field for comment text
Adding Alt and Comment boxes for collection/challenge icons
Know it's the wrong branch, start on issue 2508
Validation for Comment text
Validations for comment&alt text
Psued_spec draft.
Cuke failures in challenge_promptmeme
Cuke failures for challenge_promptmeme
Issue 1404: Allow users to save changes to work and chapter drafts without posting them.
Cukes for challenge_promptmeme including bug-fixes
Issue 2876 view fulfilled claims on user page
Merge branch 'issue2541' of git://github.com/Firewolf13/otwarchive into issue2541
Fixing based on review comments as Firewolf is busy
Merge branch 'issue2616' of git://github.com/Firewolf13/otwarchive into issue2616
Removing pseud spec for now to keep pull reqs independent
Count display on CreateTask no longer clickable/focusable
Adding HTML comment to purge cache

Signed-off-by: Frank Orozco <turbofrank@gmail.com>
heroku sqlite3 update of gem file
heroku sqlite3 update of gem file
heroku sqlite3 update of gem file
update cloudq post method
Merge branch 'master' of github.com:twilson63/node-cloudq
checking that south is not only importable, but also in INSTALLED_APPS before adding introspection rules and creator actions
Patch 1.0.5.29
better api and date stuff
Allow application to start without config/settings.yml file.

  * Added Providers.empty? method
  * check for existence of providers in layout
  * show helpful (if poorly formatted) message in index when providers are
    missing

Fixes #31
Safegaurd current_provider checks

  current_provider should return nil if there's an existing provider key in the
  session that doesn't match any providers in the settings (or, if the settings
  are empty)

  re: #31
Moved files from lib to app, create provider specific files structure in app/
removed gems that were causing compass compile to fail; reverted to the earlier version of compass that conductor users
added converge-ui stylesheets to winged monkey stylesheet
updated page layout to use converge-ui styling
replaced printStackTrace with logging
minor NPE fix
Update Documentation/Getting-Started/Installing-Umbraco-5-With-NuGet.md
Merge pull request #11 from theDiverDK/5.0.1

Fixed error regarding, that did say umbraco would work with the build in cassini webserver.
Remove USE_PGXS option.
did index and Landing.
added UserPreferences and Locations
Basic registration workflow
Adding more info to CHANGELOG
Removing the dropped service_userid field from reporters view. Related to #375
Unit movement in battle map
Delayed close for end-of-stream sockets

Signed-off-by: Pekka Enberg <penberg@valotrading.com>
Bind/unbind mousedowns on elements only, not document.
Map/Swatches/Bar borders fixed.
add facebook profile completion
Merge branch 'master' of github.com:vdebergue/big-brother
Changed connection string in DP Gateway to string
Refactored user authentication to use one less if statement
new methods , tests, ...
Updated spinner gif url
Core do Projeto

Base do projeto para o Commit
DS_store

projeto Apple
Remove experimental interfaces for release
Merge branch 'develop' into release
Merge branch 'develop'
HOTFIX: Spelling in README
Merge branch 'master' into release
HOTFIX: Document UB in lua_State* arguments
HOTFIX: Remove old Makefile
HOTFIX: Update Lua version compatibility in README
Provide compatibility with Lua 5.1.x
Update README and increment version for release candidate
HOTFIX: Remove spurious semicolon from namespace declaration
Merge branch 'develop' into release

Conflicts:
	LuaBridge.h
	README.md
HOTFIX: Use https for demo screenshot to prevent CDN caching
HOTFIX: Rename screenshot to work around CDN cache
HOTFIX: Use http instead of https for demo screenshot
Merge branch 'develop' into release
Reintegrate LuaBridgeExtras.h
Fix Visual Studio 2012 errors
implement z3c.form change-password form, tests are passing with both formlib and z3c forms
26245107 Show who logging in at right of nav
26597411 upgrade bootstrap
repositories name with link on list_documents
Added thread creation for every game
Fix init.pp class parameter and bump required apt module version to 0.0.5
add board to codeworkxs initial work and a few changes
Remove vimperator, add pentadactyl
enabled checking commited so you can see the error
fixes for the items show page layout; restricts item metadata to just the description
create DOC dir and add database details
tłumaczenie: inicjalizer (program wprowadzający) -> initalize (inicjalizacja)
Merge pull request #12 from wdalmut/master

Fix in Makefile 
updated
new theme options / image option
updated classes
suggest
suggest updated tracking
Update js/suggest.js
Update js/inline.js
Update js/popover.js
Update js/suggest.js
Update js/suggest.js
Update js/suggest.js
Update js/popover.js
Update js/inline.js
removed maven build support
move wsgi contrib to wsgi module, add CouchdbProxy class that proxy a
database.
provide a real WSGI application to proxy CouchDB.
typo.
temporary fix for couchdbkit to be used with last restkit head.
bump couchdbkit to 0.4.7. version compatible with restkit 2.0
expose SchemaListProperty to django extension. patch from Leihca on
github.
imake sure we close body on wait_once.
unicode_body is deprecated.
iupdate doc and add support for custom pool_instance in Server and
Database objects.
sync doc
if we already have data, put them.
imanage filters -> allows couchdbkit to easily use oauth.
resync doc
fix link
doc typo.
resync index
allows any parameters to be used in replication (was missing the cancel)
no support for admin yet
bum to 0.4.8-dev
close has been moved to the response.
Added twitter Bootstrap
recurring donations
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix

Conflicts:
	src/lib/aloha/editable.js
Prevents activate() method in block.js from throwing an error if a block
instance of a parent block of a nested block cannot be retreived for
whatever reason.
Fixes bug in sidebar where I accidentally negated the condition.
fixed a bug in the headerids plugin that the ids were not generated when getContents was called
Putting back the old browser plugin code. In other future. The browser dependency is no longer a plugin but an external dependency altogether.
Make the styling applied to "repository-browser-modal-window" have a
more specific selector so as not to have the position property
overwritten by jqueryui styles.
Merge branch 'hotfix' of git://github.com/alohaeditor/Aloha-Editor into hotfix
added css documentation for numerated headers plugin
Updated artifact version
Removed debugger code
API clarification
Fixes clicking in a block shows toolbar without tabs
Makes components property optional

A user may list only the tabs, without components,
to define the order of the tabs in the toolbar.
Fixed: The toggle button of the numerated-headers plugin worked the wrong way round.
Fixed: JSLint warnings for numerated headers fix.
Added a non breakable space to the annotation in order to separate the annotation from the heading's text (css is not enough)
Fixed selection update when removing annotations
added sanitize content handler to getContents and enabled sanitizing in ie8 document mode ie7
Reverts engine.js performance improvements

Reverts a02f0997b6742a968204679532aeaa8df92393cc.
That commit was supposed to get the performance improvements
from the jqueryui-ultra branch. That did not happen. Instead
some fixes from Norbert were undone.
Makes editable content snapshotting optional
Two fixes for LSM, one to ensure that cursors read from a checkpoint
if one is available. The other to reduce the number of empty chunks
that can be created initially.
Remove the hard-coded LSM checkpoint config stack: use the defaults.
Have LSM read from checkpoints.  In corner cases, we may have an empty chunk that was never checkpointed.  If so, fall back to the ordinary "current" version of that (empty) chunk.
If a drop fails to acquire all of the handle locks it needs, make sure it
releases the primary handle lock.
Fix the change to track exclusive handles for drop operations: always log the
primary first when closing, regardless of what order they appear in the handle
list.
Another fix to make sure handles are unlocked exactly once if drop fails.
Clear the btree handle at the beginning of a drop operation.
Merge pull request #336 from wiredtiger/lsm-checkpoint-open

Bug fixes for LSM open and handle locking
Don't use FLD_XXX for structures with "flags" fields.
We should be truncating files without snapshots to a single sector, that
is, if the block manager is opened without a snapshot, then any file
contents after the initial descriptor sector should be discarded.  This
is a normal case, where a file is created, contents written, and then
failure without writing a snapshot.  The reason we didn't truncate files
without snapshots to the initial descriptor sector was salvage: salvage
cleared the file's snapshot entries as soon as it started, which meant
that failure before the new snapshot was written would result in a file
that looked like a newly created file, and and a subsequent open of the
file would truncate it, which isn't what we want.
	Change snapshot open to truncate the file, regardless of whether
we were given a valid snapshot or not, so files without snapshots will
be truncated back to the descriptor sector.
	Change salvage to not load/unload a snapshot, the underlying
block manager salvage code can do what's needed instead.
	Change salvage to not clear the file's snapshot information
until it's ready to set new values.  This still isn't as durable as we
need to be, but it's a lot closer.
Change the cursor page's reference to "Data Sources" to be a subpage, so
we don't get a "Related Pages" category.
Doxygen has the idea of a hierarchy of pages starting with the
introduction page: every page should appear somewhere as a "subpage" of
a page in the hierarchy, which determines where it will appear in the
navigation tree on the left hand side.  Pages that aren't in the
hierarchy are put in a "related pages" tab at the top, which disappears
when empty, so if you see that tab it's saying that there is an orphan
page somewhere.
	Complain after the build if there's a page that isn't in the
page hierarchy.
Make sure inserts and updates are stored in lists before the lists are attached to a page, so that no thread sees a list that is set but empty.
Make sure appended records are stored in lists before the lists are attached
to a page, so that no thread sees a list that is set but empty.
Fix previous commit: we can't skip the search in column store appends.
whitespace
Check the write generation for column store appends.
Merge branch 'develop' of github.com:wiredtiger/wiredtiger into develop
Clarify a comment.
distinguish between discard types in verbose mode.
Merge branch 'develop' into handler

Conflicts:
	src/block/block_snap.c
	src/btree/rec_track.c
Comentando partes desnecessárias do .js.
update readme with correct number and indentation
pt_BR translation update WC 1.6.1
Merge pull request #1369 from John-Henrique/master

Update translation pt_BR WC 1.6.1
Allow image override for order action buttons. Closes #1489
Payment/shipping method titles. Closes #791.
Update master
Merge pull request #1125 from nodar44/master

Currency sign update
fix loading of pre-existing math elements
merged with working demo
not going to change the backdrop when displaying the modal link dialog box
Added: Remove tag above head [request]
Updated: Metrics
Changed: defaults of the config
misc 2012-11-09
* Changed diffuse lighting.
 * Using filter for shadows.
 * Added multisample textures.
 * Using multisampling (x4) for shadows with alpha to coverage for transparent objects.
 * Removed shadow and clipmap sizes bigger than 2048.
 * Removed layerd rendering for shadows.
 * Added terrain normals.
 * Added tool to generate terrain normals. The terrain data is read from an image that is used as vector field. The normals are stored encoded using optimal encoding for uint8.
 * Added optimal uint8 encoding for normals.
 * Added tests for optimal and optimal uint8 en-/decoding of normals.
 * Added 3x3 filter for multisampled textures.
 * Added new terrain files for IP.
add autolist css
xf86-video-intel: update to 2.20.9.
ltrace: switch to master branch for PIE support.
sudo: update to 1.8.6p1.
grilo: update to 0.1.20.
awesome: needs dbus-launch, so depend on dbus-x11.
change module find to cls find
color stuff change

RT
tiny render stuff

RT
Added adview support
add screen shot
add screen shot
Moving to threads
Fixed invites number
initial work on the timeline view
added xfsprogs
xbmc-addon-xvdr seems now to be part of xbmc
remove control plugin
xbmc removed for now
vdr-plugin-dvbhddevice removed for test
xbmc xbmc-addon-xvdr
add softhd
added dvb-driver-sundtek-mediaclient
added vim
skin anthra-fse = default
Update yavdr-essential
added i965-va-driver
Update yavdr-essential
Added setVerbose and setDebug methods.
relaxed version constraint
Del Z
global config update
change vim settings for line limit and JS setting
Merge branch 'master' of github.com:yosshi/oh-my-settings
Replace JSONKit to NSJSONSerialization
fixed parser bug: exists() method was protected instead of public;fixing controller and model bugs;
fixed controller bug: missing template; implemented blog (still have to rewrite for post and admin panel);
normal still wrong
AntiDupe
intervals for slider (got to be patient)
natural key cleanup
started on values support, updated userspace index logic